Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Unit: Make HandleEmoteCommand typesafe (#25249)

Browse Source 
* Scripts/ScarletMonastery: Fix wrong emote during Headless Horseman encounter

* Scripts/HoR: Fix wrong emote during escape event

* Core/Unit: Make improve type safety of HandleEmoteCommand

Change argument type to the expected enum type Emote

* Scripts/CoS: Use SetUInt32Value to set UNIT_NPC_EMOTESTATE

UNIT_NPC_EMOTESTATE is no flag field

(cherry picked from commit 6c7837f947)
This commit is contained in:
Peter Keresztes Schmidt
2020-08-15 15:29:43 +02:00
committed by Shauren
parent 595e89e02b
commit 2e3c612c80
19 changed files with 48 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Maps/MapScripts.cpp
View File

@@ -445,7 +445,7 @@ void Map::ScriptsProcess()
if (step.script->Emote.Flags & SF_EMOTE_USE_STATE)
cSource->SetEmoteState(Emote(step.script->Emote.EmoteID));
else
cSource->HandleEmoteCommand(step.script->Emote.EmoteID);
cSource->HandleEmoteCommand(static_cast<Emote>(step.script->Emote.EmoteID));
}
break;