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/Kalimdor | |
| 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/Kalimdor')
| -rw-r--r-- | src/server/scripts/Kalimdor/orgrimmar.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/the_barrens.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/thousand_needles.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/scripts/Kalimdor/orgrimmar.cpp b/src/server/scripts/Kalimdor/orgrimmar.cpp index fb5a123f24d..1d487d2a023 100644 --- a/src/server/scripts/Kalimdor/orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/orgrimmar.cpp @@ -113,7 +113,7 @@ public: void ReceiveEmote(Player* pPlayer, uint32 emote) { - if (emote == TEXTEMOTE_SALUTE && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE) + if (emote == TEXT_EMOTE_SALUTE && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE) { if (CanEmote) { diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 6ede81728e6..9c425d7e1fd 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -297,7 +297,7 @@ public: void ReceiveEmote(Player* /*pPlayer*/, uint32 emote) { - if (emote == TEXTEMOTE_SALUTE) + if (emote == TEXT_EMOTE_SALUTE) { if (FlareCount >= 2) { diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index 973cf0b7e1e..57c26381c0c 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -350,7 +350,7 @@ public: { if (pPlayer->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE) { - if (uiTextEmote == TEXTEMOTE_BECKON) + if (uiTextEmote == TEXT_EMOTE_BECKON) { me->setFaction(FACTION_FRIENDLY); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); @@ -358,7 +358,7 @@ public: } } - if (uiTextEmote == TEXTEMOTE_CHICKEN) + if (uiTextEmote == TEXT_EMOTE_CHICKEN) { if (me->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) return; |