diff options
| author | kaelima <jeppo_meyer@msn.com> | 2011-05-30 22:57:37 +0200 |
|---|---|---|
| committer | kaelima <jeppo_meyer@msn.com> | 2011-05-30 22:57:37 +0200 |
| commit | ae0d349a3ccb9d2de7f5d0aa40d084a9f0d90081 (patch) | |
| tree | ed53eab60e7cbde65f6c8d912d876dc6559fe22a /src/server/scripts/World | |
| parent | 5256b5abfeacc4e7d89d90bd085bca303419bebe (diff) | |
Core/Defines: Update enum TextEmotes, values and names from client. (These emotes comes in CMSG_TEXT_EMOTE).
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/guards.cpp | 12 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 20 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index 0bf4b966471..5ff807e0e40 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -196,12 +196,12 @@ public: { switch(emote) { - case TEXTEMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break; - case TEXTEMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break; - case TEXTEMOTE_SALUTE: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); break; - case TEXTEMOTE_SHY: me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX); break; - case TEXTEMOTE_RUDE: - case TEXTEMOTE_CHICKEN: me->HandleEmoteCommand(EMOTE_ONESHOT_POINT); break; + case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break; + case TEXT_EMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break; + case TEXT_EMOTE_SALUTE: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); break; + case TEXT_EMOTE_SHY: me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX); break; + case TEXT_EMOTE_RUDE: + case TEXT_EMOTE_CHICKEN: me->HandleEmoteCommand(EMOTE_ONESHOT_POINT); break; } } diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index b2cd3cb86f9..c78bbb2bdd8 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -352,7 +352,7 @@ public: { switch(emote) { - case TEXTEMOTE_CHICKEN: + case TEXT_EMOTE_CHICKEN: if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE && rand()%30 == 1) { me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); @@ -360,7 +360,7 @@ public: DoScriptText(EMOTE_HELLO, me); } break; - case TEXTEMOTE_CHEER: + case TEXT_EMOTE_CHEER: if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_COMPLETE) { me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); @@ -457,11 +457,11 @@ public: me->SendMessageToSet(&data, true); switch(emote) { - case TEXTEMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_SHY); break; - case TEXTEMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break; - case TEXTEMOTE_BOW: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break; - case TEXTEMOTE_JOKE: me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; - case TEXTEMOTE_DANCE: + case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_SHY); break; + case TEXT_EMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break; + case TEXT_EMOTE_BOW: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break; + case TEXT_EMOTE_JOKE: me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; + case TEXT_EMOTE_DANCE: { if (!pPlayer->HasAura(SPELL_SEDUCTION)) DoCast(pPlayer, SPELL_SEDUCTION, true); @@ -1590,7 +1590,7 @@ public: if (!IsHolidayActive(HOLIDAY_BREWFEST)) return; - if (emote == TEXTEMOTE_DANCE) + if (emote == TEXT_EMOTE_DANCE) me->CastSpell(pPlayer, 41586, false); } }; @@ -1621,7 +1621,7 @@ public: if (pPlayer->HasAura(26218)) return; - if (emote == TEXTEMOTE_KISS) + if (emote == TEXT_EMOTE_KISS) { me->CastSpell(me, 26218, false); pPlayer->CastSpell(pPlayer, 26218, false); @@ -1799,7 +1799,7 @@ public: Unit* own = me->GetOwner(); if (!own || own->GetTypeId() != TYPEID_PLAYER || CAST_PLR(own)->GetTeam() != pPlayer->GetTeam()) return; - if (emote == TEXTEMOTE_KISS) + if (emote == TEXT_EMOTE_KISS) { std::string whisp = ""; switch (rand()%8) |