Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed clif type conversion warnings (#8294)

Browse Source 
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
This commit is contained in:
Daegaladh 2024-05-03 09:26:02 +02:00 committed by GitHub
parent 38ca0998fd
commit 7ddd035442
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 133 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/battleground.cpp
View File

@ -720,7 +720,7 @@ int bg_team_get_id(struct block_list *bl)
* @param mes: Message
* @param len: Message length
*/
void bg_send_message(map_session_data *sd, const char *mes, int len)
void bg_send_message(map_session_data *sd, const char *mes, size_t len)
{
nullpo_retv(sd);

2
src/map/battleground.hpp
View File

@ -153,7 +153,7 @@ bool bg_queue_on_ready(const char *name, std::shared_ptr<s_battleground_queue> q
void bg_queue_on_accept_invite(map_session_data *sd);
void bg_queue_start_battleground(std::shared_ptr<s_battleground_queue> queue);
bool bg_member_respawn(map_session_data *sd);
void bg_send_message(map_session_data *sd, const char *mes, int len);
void bg_send_message(map_session_data *sd, const char *mes, size_t len);
void do_init_battleground(void);
void do_final_battleground(void);

216
src/map/clif.cpp
View File

@ -2238,7 +2238,7 @@ void clif_buylist( map_session_data *sd, struct npc_data *nd ){
count++;
}
p->packetLength = sizeof( struct PACKET_ZC_PC_PURCHASE_ITEMLIST ) + count * sizeof( struct PACKET_ZC_PC_PURCHASE_ITEMLIST_sub );
p->packetLength = static_cast<decltype(p->packetLength)>( sizeof( struct PACKET_ZC_PC_PURCHASE_ITEMLIST ) + count * sizeof( struct PACKET_ZC_PC_PURCHASE_ITEMLIST_sub ) );
WFIFOSET( fd, p->packetLength );
}
@ -2333,7 +2333,7 @@ void clif_npc_market_open(map_session_data *sd, struct npc_data *nd) {
count++;
}
p->packetLength = sizeof( struct PACKET_ZC_NPC_MARKET_OPEN ) + count * sizeof( struct PACKET_ZC_NPC_MARKET_OPEN_sub );
p->packetLength = static_cast<decltype(p->packetLength)>( sizeof( struct PACKET_ZC_NPC_MARKET_OPEN ) + count * sizeof( struct PACKET_ZC_NPC_MARKET_OPEN_sub ) );
WFIFOSET( fd, p->packetLength );
sd->state.trading = 1;
@ -2559,7 +2559,8 @@ void clif_sendfakenpc(map_session_data *sd, int npcid) {
void clif_scriptmenu(map_session_data* sd, int npcid, const char* mes)
{
int fd = sd->fd;
int slen = strlen(mes) + 9;
int16 slen;
slen = static_cast<decltype(slen)>( strlen(mes) + 9 );
struct block_list *bl = NULL;
if (!sd->state.using_fake_npc && (npcid == fake_nd->bl.id || ((bl = map_id2bl(npcid)) && (bl->m!=sd->bl.m ||
@ -3032,7 +3033,7 @@ void clif_inventorylist( map_session_data *sd ){
if( equip == MAX_INVENTORY_ITEM_PACKET_NORMAL ){
itemlist_equip.PacketType = inventorylistequipType;
itemlist_equip.PacketLength = ( sizeof( itemlist_equip ) - sizeof( itemlist_equip.list ) ) + ( sizeof( struct EQUIPITEM_INFO ) * equip );
itemlist_equip.PacketLength = static_cast<decltype(itemlist_equip.PacketLength)>( ( sizeof( itemlist_equip ) - sizeof( itemlist_equip.list ) ) + ( sizeof( struct EQUIPITEM_INFO ) * equip ) );
#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
itemlist_equip.invType = type;
#endif
@ -3047,7 +3048,7 @@ void clif_inventorylist( map_session_data *sd ){
if( normal == MAX_INVENTORY_ITEM_PACKET_NORMAL ){
itemlist_normal.PacketType = inventorylistnormalType;
itemlist_normal.PacketLength = ( sizeof( itemlist_normal ) - sizeof( itemlist_normal.list ) ) + ( sizeof( struct NORMALITEM_INFO ) * normal );
itemlist_normal.PacketLength = static_cast<decltype(itemlist_normal.PacketLength)>( ( sizeof( itemlist_normal ) - sizeof( itemlist_normal.list ) ) + ( sizeof( struct NORMALITEM_INFO ) * normal ) );
#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
itemlist_normal.invType = type;
#endif
@ -3061,7 +3062,7 @@ void clif_inventorylist( map_session_data *sd ){
if( normal ){
itemlist_normal.PacketType = inventorylistnormalType;
itemlist_normal.PacketLength = ( sizeof( itemlist_normal ) - sizeof( itemlist_normal.list ) ) + ( sizeof( struct NORMALITEM_INFO ) * normal );
itemlist_normal.PacketLength = static_cast<decltype(itemlist_normal.PacketLength)>( ( sizeof( itemlist_normal ) - sizeof( itemlist_normal.list ) ) + ( sizeof( struct NORMALITEM_INFO ) * normal ) );
#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
itemlist_normal.invType = type;
#endif
@ -3074,7 +3075,7 @@ void clif_inventorylist( map_session_data *sd ){
if( equip ) {
itemlist_equip.PacketType = inventorylistequipType;
itemlist_equip.PacketLength = ( sizeof( itemlist_equip ) - sizeof( itemlist_equip.list ) ) + ( sizeof( struct EQUIPITEM_INFO ) * equip );
itemlist_equip.PacketLength = static_cast<decltype(itemlist_equip.PacketLength)>( ( sizeof( itemlist_equip ) - sizeof( itemlist_equip.list ) ) + ( sizeof( struct EQUIPITEM_INFO ) * equip ) );
#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
itemlist_equip.invType = type;
#endif
@ -3127,7 +3128,7 @@ void clif_storagelist(map_session_data* sd, struct item* items, int items_length
if( equip == MAX_STORAGE_ITEM_PACKET_EQUIP ){
storage_itemlist_equip.PacketType = storageListEquipType;
storage_itemlist_equip.PacketLength = ( sizeof( storage_itemlist_equip ) - sizeof( storage_itemlist_equip.list ) ) + ( sizeof( struct EQUIPITEM_INFO ) * equip );
storage_itemlist_equip.PacketLength = static_cast<decltype(storage_itemlist_equip.PacketLength)>( ( sizeof( storage_itemlist_equip ) - sizeof( storage_itemlist_equip.list ) ) + ( sizeof( struct EQUIPITEM_INFO ) * equip ) );
#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
storage_itemlist_equip.invType = type;
#elif PACKETVER >= 20120925
@ -3144,7 +3145,7 @@ void clif_storagelist(map_session_data* sd, struct item* items, int items_length
if( normal == MAX_STORAGE_ITEM_PACKET_NORMAL ){
storage_itemlist_normal.PacketType = storageListNormalType;
storage_itemlist_normal.PacketLength = ( sizeof( storage_itemlist_normal ) - sizeof( storage_itemlist_normal.list ) ) + ( sizeof( struct NORMALITEM_INFO ) * normal );
storage_itemlist_normal.PacketLength = static_cast<decltype(storage_itemlist_normal.PacketLength)>( ( sizeof( storage_itemlist_normal ) - sizeof( storage_itemlist_normal.list ) ) + ( sizeof( struct NORMALITEM_INFO ) * normal ) );
#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
storage_itemlist_normal.invType = type;
#elif PACKETVER >= 20120925
@ -3160,7 +3161,7 @@ void clif_storagelist(map_session_data* sd, struct item* items, int items_length
if( normal ){
storage_itemlist_normal.PacketType = storageListNormalType;
storage_itemlist_normal.PacketLength = ( sizeof( storage_itemlist_normal ) - sizeof( storage_itemlist_normal.list ) ) + ( sizeof( struct NORMALITEM_INFO ) * normal );
storage_itemlist_normal.PacketLength = static_cast<decltype(storage_itemlist_normal.PacketLength)>( ( sizeof( storage_itemlist_normal ) - sizeof( storage_itemlist_normal.list ) ) + ( sizeof( struct NORMALITEM_INFO ) * normal ) );
#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
storage_itemlist_normal.invType = type;
#elif PACKETVER >= 20120925
@ -3172,7 +3173,7 @@ void clif_storagelist(map_session_data* sd, struct item* items, int items_length
if( equip ) {
storage_itemlist_equip.PacketType = storageListEquipType;
storage_itemlist_equip.PacketLength = ( sizeof( storage_itemlist_equip ) - sizeof( storage_itemlist_equip.list ) ) + ( sizeof( struct EQUIPITEM_INFO ) * equip );
storage_itemlist_equip.PacketLength = static_cast<decltype(storage_itemlist_equip.PacketLength)>( ( sizeof( storage_itemlist_equip ) - sizeof( storage_itemlist_equip.list ) ) + ( sizeof( struct EQUIPITEM_INFO ) * equip ) );
#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
storage_itemlist_equip.invType = type;
#elif PACKETVER >= 20120925
@ -3218,7 +3219,7 @@ void clif_cartlist( map_session_data *sd ){
if( normal ){
itemlist_normal.PacketType = cartlistnormalType;
itemlist_normal.PacketLength = ( sizeof( itemlist_normal ) - sizeof( itemlist_normal.list ) ) + ( sizeof( struct NORMALITEM_INFO ) * normal );
itemlist_normal.PacketLength = static_cast<decltype(itemlist_normal.PacketLength)>( ( sizeof( itemlist_normal ) - sizeof( itemlist_normal.list ) ) + ( sizeof( struct NORMALITEM_INFO ) * normal ) );
#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
itemlist_normal.invType = type;
#endif
@ -3228,7 +3229,7 @@ void clif_cartlist( map_session_data *sd ){
if( equip ){
itemlist_equip.PacketType = cartlistequipType;
itemlist_equip.PacketLength = ( sizeof( itemlist_equip ) - sizeof( itemlist_equip.list ) ) + ( sizeof( struct EQUIPITEM_INFO ) * equip );
itemlist_equip.PacketLength = static_cast<decltype(itemlist_equip.PacketLength)>( ( sizeof( itemlist_equip ) - sizeof( itemlist_equip.list ) ) + ( sizeof( struct EQUIPITEM_INFO ) * equip ) );
#if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002
itemlist_equip.invType = type;
#endif
@ -4199,8 +4200,10 @@ void clif_arrow_fail(map_session_data *sd,int type) {
void clif_arrow_create_list( map_session_data *sd ){
nullpo_retv( sd );
struct PACKET_ZC_MAKINGARROW_LIST *p = (struct PACKET_ZC_MAKINGARROW_LIST *)packet_buffer;
PACKET_ZC_MAKINGARROW_LIST *p = (PACKET_ZC_MAKINGARROW_LIST *)packet_buffer;
p->packetType = HEADER_ZC_MAKINGARROW_LIST;
p->packetLength = sizeof( *p );
int count = 0;
@ -4226,11 +4229,10 @@ void clif_arrow_create_list( map_session_data *sd ){
}
p->items[count].itemId = client_nameid( nameid );
p->packetLength += sizeof( p->items[0] );
count++;
}
p->packetLength = sizeof( struct PACKET_ZC_MAKINGARROW_LIST ) + count * sizeof( struct PACKET_ZC_MAKINGARROW_LIST_sub );
clif_send( p, p->packetLength, &sd->bl, SELF );
if( count > 0 ){
@ -6402,7 +6404,7 @@ void clif_skill_produce_mix_list( map_session_data *sd, int skill_id, int trigge
}
}
p->packetLength = sizeof( struct PACKET_ZC_MAKABLEITEMLIST ) + count * sizeof( struct PACKET_ZC_MAKABLEITEMLIST_sub );
p->packetLength = static_cast<decltype(p->packetLength)>( sizeof( struct PACKET_ZC_MAKABLEITEMLIST ) + count * sizeof( struct PACKET_ZC_MAKABLEITEMLIST_sub ) );
WFIFOSET( fd, p->packetLength );
if( count > 0 ){
@ -6455,7 +6457,7 @@ void clif_cooking_list( map_session_data *sd, int trigger, uint16 skill_id, int
}
if( count > 0 || skill_id == AM_PHARMACY ){
p->packetLength = sizeof( struct PACKET_ZC_MAKINGITEM_LIST ) + count * sizeof( struct PACKET_ZC_MAKINGITEM_LIST_sub );
p->packetLength = static_cast<decltype(p->packetLength)>( sizeof( struct PACKET_ZC_MAKINGITEM_LIST ) + count * sizeof( struct PACKET_ZC_MAKINGITEM_LIST_sub ) );
WFIFOSET( fd, p->packetLength );
sd->menuskill_id = skill_id;
@ -6466,7 +6468,7 @@ void clif_cooking_list( map_session_data *sd, int trigger, uint16 skill_id, int
#if PACKETVER >= 20090922
clif_msg_skill( sd, skill_id, INVENTORY_SPACE_FULL );
#else
p->packetLength = sizeof( struct PACKET_ZC_MAKINGITEM_LIST ) + count * sizeof( struct PACKET_ZC_MAKINGITEM_LIST_sub );
p->packetLength = static_cast<decltype(p->packetLength)>( sizeof( struct PACKET_ZC_MAKINGITEM_LIST ) + count * sizeof( struct PACKET_ZC_MAKINGITEM_LIST_sub ) );
WFIFOSET( fd, p->packetLength );
#endif
}
@ -6716,7 +6718,9 @@ void clif_displaymessage(const int fd, const char* mes)
}
#else
// Limit message to 255+1 characters (otherwise it causes a buffer overflow in the client)
int len = strnlen(line, CHAT_SIZE_MAX);
int16 len;
len = static_cast<decltype(len)>( strnlen(line, CHAT_SIZE_MAX) );
if (len > 0) { // don't send a void message (it's not displaying on the client chat). @help can send void line.
WFIFOHEAD(fd, 5 + len);
@ -6734,16 +6738,16 @@ void clif_displaymessage(const int fd, const char* mes)
/// Send broadcast message in yellow or blue without font formatting (ZC_BROADCAST).
/// 009a <packet len>.W <message>.?B
void clif_broadcast(struct block_list* bl, const char* mes, int len, int type, enum send_target target)
void clif_broadcast(struct block_list* bl, const char* mes, size_t len, int type, enum send_target target)
{
nullpo_retv(mes);
if (len < 2)
return;
struct PACKET_ZC_BROADCAST* p = (struct PACKET_ZC_BROADCAST*)packet_buffer;
PACKET_ZC_BROADCAST* p = (PACKET_ZC_BROADCAST*)packet_buffer;
p->packetType = HEADER_ZC_BROADCAST;
p->PacketLength = (int16)( sizeof( struct PACKET_ZC_BROADCAST ) + len );
p->PacketLength = static_cast<decltype(p->PacketLength)>( sizeof( *p ) + len );
if( ( type&BC_BLUE ) != 0 ){
const char* color = "blue";
@ -6798,16 +6802,16 @@ void clif_GlobalMessage(struct block_list* bl, const char* message, enum send_ta
/// Send broadcast message with font formatting.
/// 01c3 <packet len>.W <fontColor>.L <fontType>.W <fontSize>.W <fontAlign>.W <fontY>.W <message>.?B (ZC_BROADCAST2)
void clif_broadcast2(struct block_list* bl, const char* mes, int len, unsigned long fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target)
void clif_broadcast2(struct block_list* bl, const char* mes, size_t len, unsigned long fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target)
{
nullpo_retv(mes);
if (len < 2)
return;
struct PACKET_ZC_BROADCAST2* p = (struct PACKET_ZC_BROADCAST2*)packet_buffer;
PACKET_ZC_BROADCAST2* p = (PACKET_ZC_BROADCAST2*)packet_buffer;
p->packetType = HEADER_ZC_BROADCAST2;
p->PacketLength = (int16)( sizeof( struct PACKET_ZC_BROADCAST2 ) + len );
p->PacketLength = static_cast<decltype(p->PacketLength)>( sizeof( *p ) + len );
p->fontColor = fontColor;
p->fontType = fontType;
p->fontSize = fontSize;
@ -7032,35 +7036,28 @@ void clif_upgrademessage( map_session_data* sd, int result, t_itemid item_id ){
/// Whisper is transmitted to the destination player (ZC_WHISPER).
/// 0097 <packet len>.W <nick>.24B <message>.?B
/// 0097 <packet len>.W <nick>.24B <isAdmin>.L <message>.?B (PACKETVER >= 20091104)
void clif_wis_message(map_session_data* sd, const char* nick, const char* mes, int mes_len, int gmlvl){
int fd;
void clif_wis_message(map_session_data* sd, const char* nick, const char* mes, size_t mes_len, int gmlvl){
PACKET_ZC_WHISPER p;
nullpo_retv(sd);
p.PacketType = HEADER_ZC_WHISPER;
p.PacketLength = static_cast<decltype(p.PacketLength)>( mes_len );
safestrncpy(p.sender, nick, NAME_LENGTH);
safestrncpy(p.message, mes, mes_len);
fd = sd->fd;
#if PACKETVER < 20091104
WFIFOHEAD(fd, mes_len + NAME_LENGTH + 4);
WFIFOW(fd,0) = 0x97;
WFIFOW(fd,2) = mes_len + NAME_LENGTH + 4;
safestrncpy(WFIFOCP(fd,4), nick, NAME_LENGTH);
safestrncpy(WFIFOCP(fd,28), mes, mes_len);
WFIFOSET(fd,WFIFOW(fd,2));
#else
map_session_data *ssd = map_nick2sd(nick,false);
WFIFOHEAD(fd, mes_len + NAME_LENGTH + 8);
WFIFOW(fd,0) = 0x97;
WFIFOW(fd,2) = mes_len + NAME_LENGTH + 8;
safestrncpy(WFIFOCP(fd,4), nick, NAME_LENGTH);
#if PACKETVER >= 20091104
map_session_data* ssd = map_nick2sd(nick, false);
// If it is not a message from the server or a player from another map-server
if( ssd ){
if (ssd) {
gmlvl = pc_get_group_level(ssd);
}
WFIFOL(fd, 28) = (gmlvl == 99) ? 1 : 0; // isAdmin; if nonzero, also displays text above char
safestrncpy(WFIFOCP(fd,32), mes, mes_len);
WFIFOSET(fd,WFIFOW(fd,2));
p.isAdmin = (gmlvl == 99) ? 1 : 0;
#endif
#if PACKETVER_MAIN_NUM >= 20131204 || PACKETVER_RE_NUM >= 20131120 || defined(PACKETVER_ZERO)
p.senderGID = ssd->bl.id;
#endif
clif_send( &p, sizeof( p ), &sd->bl, SELF );
}
@ -7317,9 +7314,10 @@ void clif_item_damaged(map_session_data* sd, unsigned short position)
void clif_item_refine_list( map_session_data *sd ){
nullpo_retv( sd );
struct PACKET_ZC_NOTIFY_WEAPONITEMLIST *p = (struct PACKET_ZC_NOTIFY_WEAPONITEMLIST *)packet_buffer;
PACKET_ZC_NOTIFY_WEAPONITEMLIST *p = (PACKET_ZC_NOTIFY_WEAPONITEMLIST *)packet_buffer;
p->packetType = HEADER_ZC_NOTIFY_WEAPONITEMLIST;
p->packetLength = sizeof( *p );
uint16 skill_lv = pc_checkskill( sd, WS_WEAPONREFINE );
@ -7343,12 +7341,11 @@ void clif_item_refine_list( map_session_data *sd ){
p->items[count].itemId = client_nameid( sd->inventory.u.items_inventory[i].nameid );
p->items[count].refine = sd->inventory.u.items_inventory[i].refine;
clif_addcards( &p->items[count].slot, &sd->inventory.u.items_inventory[i] );
p->packetLength += sizeof( p->items[0] );
count++;
}
}
p->packetLength = sizeof( struct PACKET_ZC_NOTIFY_WEAPONITEMLIST ) + sizeof( struct PACKET_ZC_NOTIFY_WEAPONITEMLIST_sub ) * count;
clif_send( p, p->packetLength, &sd->bl, SELF );
if( count > 0 ){
@ -8141,7 +8138,7 @@ void clif_party_withdraw( map_session_data& sd, uint32 account_id, const char* n
/// Party chat message (ZC_NOTIFY_CHAT_PARTY).
/// 0109 <packet len>.W <account id>.L <message>.?B
void clif_party_message( struct party_data& party, uint32 account_id, const char* mes, int len ){
void clif_party_message( struct party_data& party, uint32 account_id, const char* mes, size_t len ){
map_session_data* sd = party_getavailablesd( &party );
if( sd == nullptr ){
@ -8153,10 +8150,10 @@ void clif_party_message( struct party_data& party, uint32 account_id, const char
len = CHAT_SIZE_MAX;
}
struct PACKET_ZC_NOTIFY_CHAT_PARTY* p = (struct PACKET_ZC_NOTIFY_CHAT_PARTY*)packet_buffer;
PACKET_ZC_NOTIFY_CHAT_PARTY* p = (PACKET_ZC_NOTIFY_CHAT_PARTY*)packet_buffer;
p->PacketType = HEADER_ZC_NOTIFY_CHAT_PARTY;
p->PacketLength = sizeof( *p ) + len;
p->PacketLength = static_cast<decltype(p->PacketLength)>( sizeof( *p ) + len );
p->AID = account_id;
safestrncpy( p->chatMsg, mes, len );
@ -9582,7 +9579,7 @@ void clif_marriage_proposal(int fd, map_session_data *sd, map_session_data* ssd)
/*==========================================
* Displays a message using the guild-chat colors to the specified targets. [Skotlex]
*------------------------------------------*/
void clif_disp_message(struct block_list* src, const char* mes, int len, enum send_target target)
void clif_disp_message(struct block_list* src, const char* mes, size_t len, enum send_target target)
{
unsigned char buf[256];
@ -9594,7 +9591,7 @@ void clif_disp_message(struct block_list* src, const char* mes, int len, enum se
}
WBUFW(buf, 0) = 0x17f;
WBUFW(buf, 2) = len + 5;
WBUFW(buf, 2) = static_cast<int16>( len + 5 );
safestrncpy(WBUFCP(buf,4), mes, len+1);
clif_send(buf, WBUFW(buf,2), src, target);
}
@ -10203,7 +10200,9 @@ void clif_slide(struct block_list *bl, int x, int y)
void clif_disp_overhead_(struct block_list *bl, const char* mes, enum send_target flag)
{
unsigned char buf[256]; //This should be more than sufficient, the theorical max is CHAT_SIZE + 8 (pads and extra inserted crap)
int len_mes = strlen(mes)+1; //Account for \0
int16 len_mes;
len_mes = static_cast<decltype(len_mes)>( strlen(mes) + 1 ); //Account for \0
if (len_mes > sizeof(buf)-8) {
ShowError("clif_disp_overhead: Message too long (length %d)\n", len_mes);
@ -10406,30 +10405,9 @@ void clif_viewequip_ack( map_session_data* sd, map_session_data* tsd ){
nullpo_retv( tsd );
struct PACKET_ZC_EQUIPWIN_MICROSCOPE* p = (struct PACKET_ZC_EQUIPWIN_MICROSCOPE*)packet_buffer;
int equip = 0;
for( int i = 0; i < EQI_MAX; i++ ){
int k = tsd->equip_index[i];
if( k >= 0 ){
if( tsd->inventory.u.items_inventory[k].nameid == 0 || tsd->inventory_data[k] == NULL ){ // Item doesn't exist
continue;
}
if( !tsd->inventory.u.items_inventory[k].equip ){
continue;
}
if( !itemdb_isequip2( tsd->inventory_data[k] ) ){ // Is not equippable
continue;
}
clif_item_equip( client_index( k ), &p->list[equip++], &tsd->inventory.u.items_inventory[k], tsd->inventory_data[k], pc_equippoint( tsd, k ) );
}
}
p->PacketType = HEADER_ZC_EQUIPWIN_MICROSCOPE;
p->PacketLength = sizeof( *p ) + sizeof( struct EQUIPITEM_INFO ) * equip;
p->PacketLength = sizeof( *p );
safestrncpy( p->characterName, tsd->status.name, NAME_LENGTH );
@ -10448,6 +10426,29 @@ void clif_viewequip_ack( map_session_data* sd, map_session_data* tsd ){
#endif
p->sex = tsd->vd.sex;
for( int i = 0, equip = 0; i < EQI_MAX; i++ ){
int k = tsd->equip_index[i];
if( k >= 0 ){
if( tsd->inventory.u.items_inventory[k].nameid == 0 || tsd->inventory_data[k] == NULL ){ // Item doesn't exist
continue;
}
if( !tsd->inventory.u.items_inventory[k].equip ){
continue;
}
if( !itemdb_isequip2( tsd->inventory_data[k] ) ){ // Is not equippable
continue;
}
clif_item_equip( client_index( k ), &p->list[equip], &tsd->inventory.u.items_inventory[k], tsd->inventory_data[k], pc_equippoint( tsd, k ) );
p->PacketLength = sizeof( p->list[0] );
equip++;
}
}
clif_send( p, p->PacketLength, &sd->bl, SELF );
#endif
}
@ -10692,12 +10693,13 @@ inline void clif_pk_mode_message(map_session_data * sd)
// Only the first 'invalid' error that appears is used.
static int clif_parse_WantToConnection_sub(int fd)
{
int packet_len, value; //Value is used to temporarily store account/char_id/sex
unsigned short cmd;
int value; //Value is used to temporarily store account/char_id/sex
//By default, start searching on the default one.
cmd = RFIFOW(fd, 0);
packet_len = RFIFOREST(fd);
uint16 cmd = RFIFOW(fd, 0);
int16 packet_len;
packet_len = static_cast<decltype(packet_len)>( RFIFOREST( fd ) );
// FIXME: If the packet is not received at once, this will FAIL.
// Figure out, when it happens, that only part of the packet is
@ -16264,17 +16266,19 @@ void clif_Mail_read( map_session_data *sd, int mail_id ){
} else {
struct mail_message *msg = &sd->mail.inbox.msg[i];
struct item *item;
int msg_len = strlen(msg->body);
int16 msg_len;
msg_len = static_cast<decltype(msg_len)>( strlen(msg->body) );
if( msg_len == 0 ) {
strcpy(msg->body, "(no message)"); // TODO: confirm for RODEX
msg_len = strlen(msg->body);
msg_len = static_cast<decltype(msg_len)>( strlen(msg->body) );
}
#if PACKETVER < 20150513
item = &msg->item[0];
int len = 101 + msg_len;
int16 len = 101 + msg_len;
WFIFOHEAD(fd,len);
WFIFOW(fd,0) = 0x242;
@ -16313,7 +16317,7 @@ void clif_Mail_read( map_session_data *sd, int mail_id ){
p->PacketLength = sizeof( struct PACKET_ZC_ACK_READ_RODEX );
p->opentype = msg->type;
p->MailID = msg->id;
p->TextcontentsLength = msg_len;
p->TextcontentsLength = static_cast<decltype(p->TextcontentsLength)>( msg_len );
p->zeny = msg->zeny;
safestrncpy( WBUFCP( p, p->PacketLength ), msg->body, msg_len );
@ -17972,7 +17976,9 @@ void clif_quest_add(map_session_data *sd, struct quest *qd)
WFIFOSET(fd, packet_len(cmd));
#if PACKETVER >= 20150513
int len = 4 + qi->objectives.size() * 12;
int16 len;
len = static_cast<decltype(len)>( 4 + qi->objectives.size() * 12 );
WFIFOHEAD(fd, len);
WFIFOW(fd, 0) = 0x8fe;
@ -18012,7 +18018,8 @@ void clif_quest_update_objective(map_session_data *sd, struct quest *qd)
int fd = sd->fd;
int offset = 6;
std::shared_ptr<s_quest_db> qi = quest_search(qd->quest_id);
int len = qi->objectives.size() * 12 + 6;
int16 len;
len = static_cast<decltype(len)>( qi->objectives.size() * 12 + 6 );
#if PACKETVER >= 20150513
int cmd = 0x9fa;
#else
@ -18389,7 +18396,7 @@ void clif_bg_xy_remove(map_session_data *sd)
/// Notifies clients of a battleground message.
/// 02DC <packet len>.W <account id>.L <name>.24B <message>.?B (ZC_BATTLEFIELD_CHAT)
void clif_bg_message( struct s_battleground_data *bg, int src_id, const char *name, const char *mes, int len ){
void clif_bg_message( struct s_battleground_data *bg, int src_id, const char *name, const char *mes, size_t len ){
map_session_data *sd = bg_getavailablesd( bg );
if( sd == nullptr ){
@ -18397,12 +18404,12 @@ void clif_bg_message( struct s_battleground_data *bg, int src_id, const char *na
}
// limit length
len = min( len + 1, CHAT_SIZE_MAX );
len = zmin( len + 1, CHAT_SIZE_MAX );
unsigned char buf[8 + NAME_LENGTH + CHAT_SIZE_MAX];
WBUFW(buf,0) = 0x2dc;
WBUFW(buf,2) = len + NAME_LENGTH + 8;
WBUFW(buf,2) = static_cast<int16>( len + NAME_LENGTH + 8 );
WBUFL(buf,4) = src_id;
safestrncpy(WBUFCP(buf,8), name, NAME_LENGTH);
safestrncpy(WBUFCP(buf,8+NAME_LENGTH), mes, len );
@ -18549,7 +18556,7 @@ void clif_bg_queue_apply_notify(const char *name, map_session_data *sd)
WFIFOHEAD(fd, packet_len(0x8d9));
WFIFOW(fd,0) = 0x8d9;
safestrncpy(WFIFOCP(fd,2), name, NAME_LENGTH);
WFIFOL(fd,2+NAME_LENGTH) = queue->teama_members.size() + queue->teamb_members.size();
WFIFOL(fd,2+NAME_LENGTH) = static_cast<int32>( queue->teama_members.size() + queue->teamb_members.size() );
WFIFOSET(fd, packet_len(0x8d9));
}
@ -19395,8 +19402,8 @@ void clif_search_store_info_ack( map_session_data* sd ){
return;
}
unsigned int start = sd->searchstore.pages * SEARCHSTORE_RESULTS_PER_PAGE ;
unsigned int end = umin( sd->searchstore.items.size(), start + SEARCHSTORE_RESULTS_PER_PAGE );
uint32 start = sd->searchstore.pages * SEARCHSTORE_RESULTS_PER_PAGE ;
uint32 end = umin( static_cast<uint32>( sd->searchstore.items.size() ), start + SEARCHSTORE_RESULTS_PER_PAGE );
int len = sizeof( struct PACKET_ZC_SEARCH_STORE_INFO_ACK ) + ( end - start ) * sizeof( struct PACKET_ZC_SEARCH_STORE_INFO_ACK_sub );
WFIFOHEAD( fd, len );
@ -19524,17 +19531,17 @@ void clif_search_store_info_click_ack(map_session_data* sd, short x, short y)
/// Parse function for packet debugging.
void clif_parse_debug(int fd,map_session_data *sd)
{
int cmd, packet_len;
int16 packet_len;
// clif_parse ensures, that there is at least 2 bytes of data
cmd = RFIFOW(fd,0);
uint16 cmd = RFIFOW(fd,0);
if( sd ) {
packet_len = packet_db[cmd].len;
if( packet_len == 0 )
{// unknown
packet_len = RFIFOREST(fd);
packet_len = static_cast<decltype(packet_len)>( RFIFOREST(fd) );
}
else if( packet_len == -1 )
{// variable length
@ -19544,7 +19551,7 @@ void clif_parse_debug(int fd,map_session_data *sd)
}
else
{
packet_len = RFIFOREST(fd);
packet_len = static_cast<decltype(packet_len)>( RFIFOREST(fd) );
ShowDebug("Packet debug of 0x%04X (length %d), session #%d\n", cmd, packet_len, fd);
}
@ -19557,19 +19564,20 @@ void clif_parse_debug(int fd,map_session_data *sd)
void clif_elementalconverter_list( map_session_data *sd ){
nullpo_retv( sd );
struct PACKET_ZC_MAKINGARROW_LIST *p = (struct PACKET_ZC_MAKINGARROW_LIST *)packet_buffer;
PACKET_ZC_MAKINGARROW_LIST *p = (PACKET_ZC_MAKINGARROW_LIST *)packet_buffer;
p->packetType = HEADER_ZC_MAKINGARROW_LIST;
p->packetLength = sizeof( *p );
int count = 0;
for( int i = 0; i < MAX_SKILL_PRODUCE_DB; i++ ){
if( skill_can_produce_mix( sd, skill_produce_db[i].nameid, 23, 1 ) ){
p->items[count].itemId = client_nameid( skill_produce_db[i].nameid );
p->packetLength += sizeof( p->items[0] );
count++;
}
}
p->packetLength = sizeof( struct PACKET_ZC_MAKINGARROW_LIST ) + count * sizeof( struct PACKET_ZC_MAKINGARROW_LIST_sub );
clif_send( p, p->packetLength, &sd->bl, SELF );
if( count > 0 ){
@ -21066,7 +21074,7 @@ void clif_parse_merge_item_cancel(int fd, map_session_data* sd) {
static std::string clif_hide_name(const char* original_name)
{
std::string censored(original_name);
int hide = min(battle_config.broadcast_hide_name, censored.length() - 1);
size_t hide = zmin(battle_config.broadcast_hide_name, censored.length() - 1);
censored.replace(censored.length() - hide, hide, hide, '*');
return censored;
}

12
src/map/clif.hpp
View File

@ -774,7 +774,7 @@ void clif_status_change(struct block_list *bl, int type, int flag, t_tick tick,
void clif_efst_status_change(struct block_list *bl, int tid, enum send_target target, int type, t_tick tick, int val1, int val2, int val3);
void clif_efst_status_change_sub(struct block_list *tbl, struct block_list *bl, enum send_target target);
void clif_wis_message(map_session_data* sd, const char* nick, const char* mes, int mes_len, int gmlvl);
void clif_wis_message(map_session_data* sd, const char* nick, const char* mes, size_t mes_len, int gmlvl);
void clif_wis_end(int fd, int result);
void clif_solved_charname(int fd, int charid, const char* name);
@ -830,7 +830,7 @@ void clif_party_invite( map_session_data& sd, map_session_data& tsd );
void clif_party_invite_reply( map_session_data& sd, const char* nick, enum e_party_invite_reply reply );
void clif_party_option(struct party_data *p,map_session_data *sd,int flag);
void clif_party_withdraw( map_session_data& sd, uint32 account_id, const char* name, enum e_party_member_withdraw result, enum send_target target );
void clif_party_message( struct party_data& party, uint32 account_id, const char* mes, int len );
void clif_party_message( struct party_data& party, uint32 account_id, const char* mes, size_t len );
void clif_party_xy( map_session_data& sd );
void clif_party_xy_single( map_session_data& sd, map_session_data& tsd );
void clif_party_hp( map_session_data& sd );
@ -874,7 +874,7 @@ void clif_guild_castle_teleport_res(map_session_data& sd, enum e_siege_teleport_
void clif_bg_hp(map_session_data *sd);
void clif_bg_xy(map_session_data *sd);
void clif_bg_xy_remove(map_session_data *sd);
void clif_bg_message(struct s_battleground_data *bg, int src_id, const char *name, const char *mes, int len);
void clif_bg_message(struct s_battleground_data *bg, int src_id, const char *name, const char *mes, size_t len);
void clif_bg_updatescore(int16 m);
void clif_bg_updatescore_single(map_session_data *sd);
void clif_sendbgemblem_area(map_session_data *sd);
@ -900,9 +900,9 @@ void clif_font(map_session_data *sd);
// atcommand
void clif_displaymessage(const int fd, const char* mes);
void clif_disp_message(struct block_list* src, const char* mes, int len, enum send_target target);
void clif_broadcast(struct block_list* bl, const char* mes, int len, int type, enum send_target target);
void clif_broadcast2(struct block_list* bl, const char* mes, int len, unsigned long fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target);
void clif_disp_message(struct block_list* src, const char* mes, size_t len, enum send_target target);
void clif_broadcast(struct block_list* bl, const char* mes, size_t len, int type, enum send_target target);
void clif_broadcast2(struct block_list* bl, const char* mes, size_t len, unsigned long fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target);
void clif_heal(int fd,int type,int val);
void clif_resurrection(struct block_list *bl,int type);
void clif_map_property(struct block_list *bl, enum map_property property, enum send_target t);

1
src/map/clif_packetdb.hpp
View File

@ -57,7 +57,6 @@
packet(0x0093,2);
parseable_packet(0x0094,6,clif_parse_GetCharNameRequest,2);
parseable_packet(0x0096,-1,clif_parse_WisMessage,2,4,28);
packet(0x0097,-1);
packet(0x0098,3);
parseable_packet(0x0099,-1,clif_parse_Broadcast,2,4);
packet(0x009a,-1);

2
src/map/guild.cpp
View File

@ -1370,7 +1370,7 @@ int guild_recv_memberinfoshort(int guild_id,uint32 account_id,uint32 char_id,int
/*====================================================
* Send a message to whole guild
*---------------------------------------------------*/
int guild_send_message(map_session_data *sd,const char *mes,int len) {
int guild_send_message(map_session_data *sd, const char *mes, size_t len) {
nullpo_ret(sd);
if(sd->status.guild_id==0)

2
src/map/guild.hpp
View File

@ -90,7 +90,7 @@ int guild_notice_changed(int guild_id,const char *mes1,const char *mes2);
int guild_change_emblem( map_session_data& sd, int len, const char* data );
int guild_change_emblem_version( map_session_data& sd, int version );
int guild_emblem_changed(int len,int guild_id,int emblem_id,const char *data);
int guild_send_message(map_session_data *sd,const char *mes,int len);
int guild_send_message(map_session_data *sd, const char *mes, size_t len);
int guild_recv_message(int guild_id,uint32 account_id,const char *mes,int len);
int guild_send_dot_remove(map_session_data *sd);
int guild_skillupack(int guild_id,uint16 skill_id,uint32 account_id);

12
src/map/intif.cpp
View File

@ -310,7 +310,7 @@ int intif_main_message(map_session_data* sd, const char* message)
* @param mes_len : Size of message
* @return 0=Message not send, 1=Message send
*/
int intif_wis_message(map_session_data *sd, char *nick, char *mes, int mes_len)
int intif_wis_message(map_session_data *sd, char *nick, char *mes, size_t mes_len)
{
int headersize = 8 + 2 * NAME_LENGTH;
@ -326,7 +326,7 @@ int intif_wis_message(map_session_data *sd, char *nick, char *mes, int mes_len)
WFIFOHEAD(inter_fd,mes_len + headersize);
WFIFOW(inter_fd,0) = 0x3001;
WFIFOW(inter_fd,2) = mes_len + headersize;
WFIFOW(inter_fd,2) = static_cast<int16>( mes_len + headersize);
WFIFOL(inter_fd,4) = pc_get_group_level(sd);
safestrncpy(WFIFOCP(inter_fd,8), sd->status.name, NAME_LENGTH);
safestrncpy(WFIFOCP(inter_fd,8+NAME_LENGTH), nick, NAME_LENGTH);
@ -748,7 +748,7 @@ int intif_break_party(int party_id)
* @param len : Size of the message
* @return 0=error, 1=msg sent
*/
int intif_party_message(int party_id,uint32 account_id,const char *mes,int len)
int intif_party_message(int party_id, uint32 account_id, const char *mes, size_t len)
{
if (CheckForCharServer())
return 0;
@ -758,7 +758,7 @@ int intif_party_message(int party_id,uint32 account_id,const char *mes,int len)
WFIFOHEAD(inter_fd,len + 12);
WFIFOW(inter_fd,0)=0x3027;
WFIFOW(inter_fd,2)=len+12;
WFIFOW(inter_fd,2)=static_cast<int16>( len + 12 );
WFIFOL(inter_fd,4)=party_id;
WFIFOL(inter_fd,8)=account_id;
safestrncpy(WFIFOCP(inter_fd,12),mes,len);
@ -954,7 +954,7 @@ int intif_guild_break(int guild_id)
* @param len : Size of the message
* @return 0=error, 1=msg_sent
*/
int intif_guild_message(int guild_id,uint32 account_id,const char *mes,int len)
int intif_guild_message(int guild_id, uint32 account_id, const char *mes, size_t len)
{
if (CheckForCharServer())
return 0;
@ -964,7 +964,7 @@ int intif_guild_message(int guild_id,uint32 account_id,const char *mes,int len)
WFIFOHEAD(inter_fd, len + 12);
WFIFOW(inter_fd,0)=0x3037;
WFIFOW(inter_fd,2)=len+12;
WFIFOW(inter_fd,2)=static_cast<int16>( len + 12 );
WFIFOL(inter_fd,4)=guild_id;
WFIFOL(inter_fd,8)=account_id;
safestrncpy(WFIFOCP(inter_fd,12),mes,len);

6
src/map/intif.hpp
View File

@ -29,7 +29,7 @@ int intif_broadcast_obtain_special_item(map_session_data *sd, t_itemid nameid, u
int intif_broadcast_obtain_special_item_npc(map_session_data *sd, t_itemid nameid);
int intif_main_message(map_session_data* sd, const char* message);
int intif_wis_message(map_session_data *sd,char *nick,char *mes,int mes_len);
int intif_wis_message(map_session_data *sd, char *nick, char *mes, size_t mes_len);
int intif_wis_message_to_gm(char *Wisp_name, int permission, char *mes);
int intif_saveregistry(map_session_data *sd);
@ -46,7 +46,7 @@ int intif_party_changeoption(int party_id, uint32 account_id, int exp, int item)
int intif_party_leave(int party_id, uint32 account_id, uint32 char_id, const char *name, enum e_party_member_withdraw type);
int intif_party_changemap(map_session_data *sd, int online);
int intif_break_party(int party_id);
int intif_party_message(int party_id, uint32 account_id, const char *mes,int len);
int intif_party_message(int party_id, uint32 account_id, const char *mes, size_t len);
int intif_party_leaderchange(int party_id,uint32 account_id,uint32 char_id);
int intif_party_sharelvlupdate(unsigned int share_lvl);
@ -56,7 +56,7 @@ int intif_guild_addmember(int guild_id, struct guild_member *m);
int intif_guild_leave(int guild_id, uint32 account_id, uint32 char_id, int flag, const char *mes);
int intif_guild_memberinfoshort(int guild_id, uint32 account_id, uint32 char_id, int online, int lv, int class_);
int intif_guild_break(int guild_id);
int intif_guild_message(int guild_id, uint32 account_id, const char *mes, int len);
int intif_guild_message(int guild_id, uint32 account_id, const char *mes, size_t len);
int intif_guild_change_gm(int guild_id, const char* name, int len);
int intif_guild_change_basicinfo(int guild_id, int type, const void *data, int len);
int intif_guild_change_memberinfo(int guild_id, uint32 account_id, uint32 char_id, int type, const void *data, int len);

2
src/map/party.cpp
View File

@ -1039,7 +1039,7 @@ int party_send_logout(map_session_data *sd)
return 1;
}
int party_send_message(map_session_data *sd,const char *mes,int len)
int party_send_message(map_session_data *sd,const char *mes, size_t len)
{
if(sd->status.party_id == 0)
return 0;

2
src/map/party.hpp
View File

@ -88,7 +88,7 @@ int party_changeleader(map_session_data *sd, map_session_data *t_sd, struct part
void party_send_movemap(map_session_data *sd);
void party_send_levelup(map_session_data *sd);
int party_send_logout(map_session_data *sd);
int party_send_message(map_session_data *sd,const char *mes,int len);
int party_send_message(map_session_data *sd,const char *mes, size_t len);
int party_recv_message(int party_id,uint32 account_id,const char *mes,int len);
int party_skill_check(map_session_data *sd, int party_id, uint16 skill_id, uint16 skill_lv);
int party_send_xy_clear(struct party_data *p);