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/scripts/Kalimdor | |
| 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/scripts/Kalimdor')
| -rw-r--r-- | src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp | 12 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index b246c8da786..abbb21686fe 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -617,7 +617,7 @@ struct npc_martha_goslin : public CreatureScript InterruptTimer = 12000; SplineChainMovementGenerator::GetResumeInfo(ResumeInfo, me); me->GetMotionMaster()->Clear(); - me->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); } void MovementInform(uint32 type, uint32 id) override @@ -627,12 +627,12 @@ struct npc_martha_goslin : public CreatureScript switch (id) { case MOVEID_EVENT1: - me->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); me->SetFacingTo(marthaIdleOrientation1, true); Events.ScheduleEvent(EVENT_MARTHA_IDLE2, Seconds(9), Seconds(15)); break; case MOVEID_EVENT2: - me->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); me->SetFacingTo(marthaIdleOrientation2, true); Events.ScheduleEvent(EVENT_MARTHA_IDLE1, Seconds(9), Seconds(15)); break; @@ -669,11 +669,11 @@ struct npc_martha_goslin : public CreatureScript switch (eventId) { case EVENT_MARTHA_IDLE1: - me->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); me->GetMotionMaster()->MoveAlongSplineChain(MOVEID_EVENT1, CHAIN_MARTHA_IDLE1, true); break; case EVENT_MARTHA_IDLE2: - me->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); me->GetMotionMaster()->MoveAlongSplineChain(MOVEID_EVENT2, CHAIN_MARTHA_IDLE2, true); break; default: @@ -684,7 +684,7 @@ struct npc_martha_goslin : public CreatureScript void JustAppeared() override { - me->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); Events.RescheduleEvent(EVENT_MARTHA_IDLE2, Seconds(5), Seconds(10)); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp index c267e9bfd0f..2dcc3246dee 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp @@ -1074,7 +1074,7 @@ public: DoCast(citizen, SPELL_CRUSADER_STRIKE, TRIGGERED_IGNORE_SET_FACING); if (Creature* resident = me->FindNearestCreature(NPC_RESIDENT, 100.0f, true)) { - resident->SetFlag(UNIT_NPC_EMOTESTATE, EMOTE_STATE_COWER); + resident->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_COWER); resident->AI()->Talk(RP2_LINE_RESIDENT1, ObjectAccessor::GetUnit(*me, _eventStarterGuid)); } break; |