diff options
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp | 23 |
2 files changed, 9 insertions, 16 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 841034035bf..eebe379b8c7 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -524,7 +524,7 @@ struct boss_headless_horseman : public ScriptedAI if (Player* player = it->GetSource()) { player->Say(HeadlessHorsemanInitialPlayerTexts[talkContext.GetRepeatCounter()], LANG_UNIVERSAL); - player->HandleEmoteCommand(ANIM_EMOTE_SHOUT); + player->HandleEmoteCommand(EMOTE_ONESHOT_SHOUT); } } diff --git a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp index c59df0ed693..81661015ca5 100644 --- a/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp @@ -275,27 +275,20 @@ enum RedridgeCitizen EVENT_SAY_TEXT = 9, // Used by npc's in Lakeshire Townhall EVENT_LEAVE_TOWNHALL = 10, // Used by npc's in Lakeshire Townhall - EMOTE_ONESHOTCHEER = 4, - EMOTE_ONESHOTROAR = 15, - EMOTE_ONESHOTSHOT = 22, - EMOTE_ONESHOTPOINT = 25, - EMOTE_ONESHOTBATTLEROAR = 53, - EMOTE_ONESHOTNO = 274, - SAY_IN_TOWNHALL = 0, // Used by npc's in Lakeshire Townhall SAY_LEAVE_TOWNHALL = 1, // Used by npc's in Lakeshire Townhall SPELL_APPLY_QUEST_INVIS_ZONE_19 = 82099 // Used by npc's in Lakeshire Townhall }; -const uint32 Emote[6] = +const Emote EmoteID[6] = { - EMOTE_ONESHOTCHEER, - EMOTE_ONESHOTROAR, - EMOTE_ONESHOTSHOT, - EMOTE_ONESHOTPOINT, - EMOTE_ONESHOTBATTLEROAR, - EMOTE_ONESHOTNO + EMOTE_ONESHOT_CHEER, + EMOTE_ONESHOT_ROAR, + EMOTE_ONESHOT_SHOUT, + EMOTE_ONESHOT_POINT, + EMOTE_ONESHOT_BATTLE_ROAR, + EMOTE_ONESHOT_NO }; uint32 const pathSize = 8; @@ -343,7 +336,7 @@ public: _events.ScheduleEvent(EVENT_SAY_TEXT, Seconds(5), Seconds(30)); break; case EVENT_PLAYEMOTE: - me->HandleEmoteCommand(Emote[urand(0, 5)]); + me->HandleEmoteCommand(EmoteID[urand(0, 5)]); _events.ScheduleEvent(EVENT_PLAYEMOTE, Seconds(10), Seconds(25)); break; case EVENT_SAY_TEXT: |