diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-08-15 15:29:43 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-26 21:46:51 +0100 |
| commit | 2e3c612c808bca7601b32ce5dca28b204e652773 (patch) | |
| tree | 61f88efa0f2bc5781183ad5c8989b508f46b634c /src/server/scripts/BrokenIsles | |
| parent | 595e89e02bec7300b3dd42afc5899a64f79aecba (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
(cherry picked from commit 6c7837f947ff4eb5110a116a371daa6f9e2b3bbe)
Diffstat (limited to 'src/server/scripts/BrokenIsles')
| -rw-r--r-- | src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp b/src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp index b9f4e994d5a..488c6110c34 100644 --- a/src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp +++ b/src/server/scripts/BrokenIsles/zone_orderhall_warrior.cpp @@ -198,7 +198,7 @@ struct npc_feasting_valarjar : public ScriptedAI { _scheduler.Schedule(5s, 30s, [this](TaskContext context) { - uint32 emoteID = Trinity::Containers::SelectRandomContainerElement(_randomEmotes); + Emote emoteID = Trinity::Containers::SelectRandomContainerElement(_randomEmotes); if (emoteID == EMOTE_ONESHOT_EAT_NO_SHEATHE) { me->SetVirtualItem(0, urand(0, 1) ? ITEM_MONSTER_ITEM_MUTTON_WITH_BITE : ITEM_MONSTER_ITEM_TANKARD_WOODEN); @@ -235,7 +235,7 @@ struct npc_feasting_valarjar : public ScriptedAI private: TaskScheduler _scheduler; - std::unordered_set<uint32> _randomEmotes; + std::unordered_set<Emote> _randomEmotes; }; struct npc_valarjar_paying_respect_to_odyn : ScriptedAI @@ -302,7 +302,7 @@ struct npc_valarjar_paying_respect_to_odyn : ScriptedAI private: TaskScheduler _scheduler; - std::unordered_set<uint32> _randomEmotes; + std::unordered_set<Emote> _randomEmotes; }; struct npc_incoming_valarjar_aspirant_1 : public npc_valarjar_paying_respect_to_odyn @@ -583,7 +583,7 @@ struct npc_spectating_valarjar : public ScriptedAI private: TaskScheduler _scheduler; - std::unordered_set<uint32> _randomEmotes; + std::unordered_set<Emote> _randomEmotes; }; struct npc_valkyr_of_odyn : public ScriptedAI |