pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-08-27 06:38:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug] UINT32 EmoteID (#2369)

Browse Source 
emoteid packet structure is UINT32 but a number of references are in UINT16.
This commit is contained in:
Michael
2022-08-13 19:41:14 -04:00
committed by GitHub
parent 79285b1002
commit f6889d20e9
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/npc.cpp
+4 -4
View File
@@ -399,7 +399,7 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi
qGlobals = nullptr;
SetEmoteID(static_cast<uint16>(npc_type_data->emoteid));
SetEmoteID(static_cast<uint32>(npc_type_data->emoteid));
InitializeBuffSlots();
CalcBonuses();
@@ -1087,7 +1087,7 @@ void NPC::UpdateEquipmentLight()
}
void NPC::Depop(bool StartSpawnTimer) {
uint16 emoteid = GetEmoteID();
uint32 emoteid = GetEmoteID();
if(emoteid != 0)
DoNPCEmote(ONDESPAWN,emoteid);
p_depop = true;
@@ -3012,7 +3012,7 @@ void NPC::SignalNPC(int _signal_id)
signal_q.push_back(_signal_id);
}
NPC_Emote_Struct* NPC::GetNPCEmote(uint16 emoteid, uint8 event_) {
NPC_Emote_Struct* NPC::GetNPCEmote(uint32 emoteid, uint8 event_) {
LinkedListIterator<NPC_Emote_Struct*> iterator(zone->NPCEmoteList);
iterator.Reset();
while(iterator.MoreElements())
@@ -3026,7 +3026,7 @@ NPC_Emote_Struct* NPC::GetNPCEmote(uint16 emoteid, uint8 event_) {
return (nullptr);
}
void NPC::DoNPCEmote(uint8 event_, uint16 emoteid)
void NPC::DoNPCEmote(uint8 event_, uint32 emoteid)
{
if(this == nullptr || emoteid == 0)
{