diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-08-15 15:29:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-15 15:29:43 +0200 |
| commit | 6c7837f947ff4eb5110a116a371daa6f9e2b3bbe (patch) | |
| tree | 68c0338b65932b47b62903f8b09a3f573909b66e /src/server/game/Maps/MapScripts.cpp | |
| parent | 34d403e83f42304332f89ffc73549f6f2c695ccd (diff) | |
Core/Unit: Make HandleEmoteCommand typesafe (#25249)
* 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
Diffstat (limited to 'src/server/game/Maps/MapScripts.cpp')
| -rw-r--r-- | src/server/game/Maps/MapScripts.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Maps/MapScripts.cpp b/src/server/game/Maps/MapScripts.cpp index 0b6f4901c3d..63c4113348e 100644 --- a/src/server/game/Maps/MapScripts.cpp +++ b/src/server/game/Maps/MapScripts.cpp @@ -450,7 +450,7 @@ void Map::ScriptsProcess() if (step.script->Emote.Flags & SF_EMOTE_USE_STATE) cSource->SetUInt32Value(UNIT_NPC_EMOTESTATE, step.script->Emote.EmoteID); else - cSource->HandleEmoteCommand(step.script->Emote.EmoteID); + cSource->HandleEmoteCommand(static_cast<Emote>(step.script->Emote.EmoteID)); } break; |