|
|
@@ -12438,7 +12438,7 @@ void clif_parse_ChatRoomStatusChange(int32 fd, map_session_data* sd){
|
|
|
|
|
|
safestrncpy( s_password, p->password, sizeof( s_password ) );
|
|
|
// NOTE: assumes that safestrncpy will not access the len+1'th byte
|
|
|
- safestrncpy( s_title, p->title, min( len + 1, CHATROOM_TITLE_SIZE ) );
|
|
|
+ safestrncpy( s_title, p->title, std::min<size_t>( len + 1, CHATROOM_TITLE_SIZE ) );
|
|
|
|
|
|
chat_changechatstatus( sd, s_title, s_password, p->limit, p->type );
|
|
|
}
|
|
|
@@ -13391,7 +13391,7 @@ void clif_parse_NpcStringInput(int32 fd, map_session_data* sd){
|
|
|
message_len++;
|
|
|
#endif
|
|
|
|
|
|
- safestrncpy( sd->npc_str, p->value, min( message_len, CHATBOX_SIZE ) );
|
|
|
+ safestrncpy( sd->npc_str, p->value, std::min<size_t>( message_len, CHATBOX_SIZE ) );
|
|
|
|
|
|
if( battle_config.idletime_option&IDLE_NPC_INPUT ){
|
|
|
sd->idletime = last_tick;
|
Lemongrass3110