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

Fixed clif_wis_message (#8308)

Browse Source 
Fixes #8307

Thanks to @mrpond
This commit is contained in:
Lemongrass3110 2024-05-06 02:04:51 +02:00 committed by GitHub
parent fd36fc04b2
commit a44d9540fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/map/clif.cpp
View File

@ -7037,27 +7037,30 @@ void clif_upgrademessage( map_session_data* sd, int result, t_itemid item_id ){
/// 0097 <packet len>.W <nick>.24B <message>.?B /// 0097 <packet len>.W <nick>.24B <message>.?B
/// 0097 <packet len>.W <nick>.24B <isAdmin>.L <message>.?B (PACKETVER >= 20091104) /// 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, size_t mes_len, int gmlvl){ void clif_wis_message(map_session_data* sd, const char* nick, const char* mes, size_t mes_len, int gmlvl){
PACKET_ZC_WHISPER p; PACKET_ZC_WHISPER* p = reinterpret_cast<PACKET_ZC_WHISPER*>( packet_buffer );
p.PacketType = HEADER_ZC_WHISPER; p->PacketType = HEADER_ZC_WHISPER;
p.PacketLength = static_cast<decltype(p.PacketLength)>( mes_len ); p->PacketLength = sizeof( *p );
safestrncpy(p.sender, nick, NAME_LENGTH); safestrncpy( p->sender, nick, NAME_LENGTH );
safestrncpy(p.message, mes, mes_len); safestrncpy( p->message, mes, mes_len );
p->PacketLength += static_cast<decltype( p->PacketLength )>( mes_len );
#if PACKETVER >= 20091104 #if PACKETVER >= 20091104
map_session_data* ssd = map_nick2sd(nick, false); 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 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); gmlvl = pc_get_group_level(ssd);
} }
p.isAdmin = (gmlvl == 99) ? 1 : 0;
p->isAdmin = (gmlvl == 99) ? 1 : 0;
#endif #endif
#if PACKETVER_MAIN_NUM >= 20131204 || PACKETVER_RE_NUM >= 20131120 || defined(PACKETVER_ZERO) #if PACKETVER_MAIN_NUM >= 20131204 || PACKETVER_RE_NUM >= 20131120 || defined(PACKETVER_ZERO)
p.senderGID = ssd->bl.id; p->senderGID = ssd->bl.id;
#endif #endif
clif_send( &p, sizeof( p ), &sd->bl, SELF ); clif_send( p, p->PacketLength, &sd->bl, SELF );
} }