diff options
| -rwxr-xr-x | src/server/game/Miscellaneous/SharedDefines.h | 422 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp | 10 | ||||
| -rw-r--r-- | src/server/scripts/Examples/example_creature.cpp | 4 | ||||
| -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 | ||||
| -rw-r--r-- | src/server/scripts/World/guards.cpp | 12 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 20 |
8 files changed, 277 insertions, 199 deletions
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index a3042808ea6..bafdf3f094f 100755 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -1496,178 +1496,256 @@ enum GameObjectDynamicLowFlags enum TextEmotes { - TEXTEMOTE_AGREE = 1, - TEXTEMOTE_AMAZE = 2, - TEXTEMOTE_ANGRY = 3, - TEXTEMOTE_APOLOGIZE = 4, - TEXTEMOTE_APPLAUD = 5, - TEXTEMOTE_BASHFUL = 6, - TEXTEMOTE_BECKON = 7, - TEXTEMOTE_BEG = 8, - TEXTEMOTE_BITE = 9, - TEXTEMOTE_BLEED = 10, - TEXTEMOTE_BLINK = 11, - TEXTEMOTE_BLUSH = 12, - TEXTEMOTE_BONK = 13, - TEXTEMOTE_BORED = 14, - TEXTEMOTE_BOUNCE = 15, - TEXTEMOTE_BRB = 16, - TEXTEMOTE_BOW = 17, - TEXTEMOTE_BURP = 18, - TEXTEMOTE_BYE = 19, - TEXTEMOTE_CACKLE = 20, - TEXTEMOTE_CHEER = 21, - TEXTEMOTE_CHICKEN = 22, - TEXTEMOTE_CHUCKLE = 23, - TEXTEMOTE_CLAP = 24, - TEXTEMOTE_CONFUSED = 25, - TEXTEMOTE_CONGRATULATE = 26, - TEXTEMOTE_COUGH = 27, - TEXTEMOTE_COWER = 28, - TEXTEMOTE_CRACK = 29, - TEXTEMOTE_CRINGE = 30, - TEXTEMOTE_CRY = 31, - TEXTEMOTE_CURIOUS = 32, - TEXTEMOTE_CURTSEY = 33, - TEXTEMOTE_DANCE = 34, - TEXTEMOTE_DRINK = 35, - TEXTEMOTE_DROOL = 36, - TEXTEMOTE_EAT = 37, - TEXTEMOTE_EYE = 38, - TEXTEMOTE_FART = 39, - TEXTEMOTE_FIDGET = 40, - TEXTEMOTE_FLEX = 41, - TEXTEMOTE_FROWN = 42, - TEXTEMOTE_GASP = 43, - TEXTEMOTE_GAZE = 44, - TEXTEMOTE_GIGGLE = 45, - TEXTEMOTE_GLARE = 46, - TEXTEMOTE_GLOAT = 47, - TEXTEMOTE_GREET = 48, - TEXTEMOTE_GRIN = 49, - TEXTEMOTE_GROAN = 50, - TEXTEMOTE_GROVEL = 51, - TEXTEMOTE_GUFFAW = 52, - TEXTEMOTE_HAIL = 53, - TEXTEMOTE_HAPPY = 54, - TEXTEMOTE_HELLO = 55, - TEXTEMOTE_HUG = 56, - TEXTEMOTE_HUNGRY = 57, - TEXTEMOTE_KISS = 58, - TEXTEMOTE_KNEEL = 59, - TEXTEMOTE_LAUGH = 60, - TEXTEMOTE_LAYDOWN = 61, - TEXTEMOTE_MESSAGE = 62, - TEXTEMOTE_MOAN = 63, - TEXTEMOTE_MOON = 64, - TEXTEMOTE_MOURN = 65, - TEXTEMOTE_NO = 66, - TEXTEMOTE_NOD = 67, - TEXTEMOTE_NOSEPICK = 68, - TEXTEMOTE_PANIC = 69, - TEXTEMOTE_PEER = 70, - TEXTEMOTE_PLEAD = 71, - TEXTEMOTE_POINT = 72, - TEXTEMOTE_POKE = 73, - TEXTEMOTE_PRAY = 74, - TEXTEMOTE_ROAR = 75, - TEXTEMOTE_ROFL = 76, - TEXTEMOTE_RUDE = 77, - TEXTEMOTE_SALUTE = 78, - TEXTEMOTE_SCRATCH = 79, - TEXTEMOTE_SEXY = 80, - TEXTEMOTE_SHAKE = 81, - TEXTEMOTE_SHOUT = 82, - TEXTEMOTE_SHRUG = 83, - TEXTEMOTE_SHY = 84, - TEXTEMOTE_SIGH = 85, - TEXTEMOTE_SIT = 86, - TEXTEMOTE_SLEEP = 87, - TEXTEMOTE_SNARL = 88, - TEXTEMOTE_SPIT = 89, - TEXTEMOTE_STARE = 90, - TEXTEMOTE_SURPRISED = 91, - TEXTEMOTE_SURRENDER = 92, - TEXTEMOTE_TALK = 93, - TEXTEMOTE_TALKEX = 94, - TEXTEMOTE_TALKQ = 95, - TEXTEMOTE_TAP = 96, - TEXTEMOTE_THANK = 97, - TEXTEMOTE_THREATEN = 98, - TEXTEMOTE_TIRED = 99, - TEXTEMOTE_VICTORY = 100, - TEXTEMOTE_WAVE = 101, - TEXTEMOTE_WELCOME = 102, - TEXTEMOTE_WHINE = 103, - TEXTEMOTE_WHISTLE = 104, - TEXTEMOTE_WORK = 105, - TEXTEMOTE_YAWN = 106, - TEXTEMOTE_BOGGLE = 107, - TEXTEMOTE_CALM = 108, - TEXTEMOTE_COLD = 109, - TEXTEMOTE_COMFORT = 110, - TEXTEMOTE_CUDDLE = 111, - TEXTEMOTE_DUCK = 112, - TEXTEMOTE_INSULT = 113, - TEXTEMOTE_INTRODUCE = 114, - TEXTEMOTE_JK = 115, - TEXTEMOTE_LICK = 116, - TEXTEMOTE_LISTEN = 117, - TEXTEMOTE_LOST = 118, - TEXTEMOTE_MOCK = 119, - TEXTEMOTE_PONDER = 120, - TEXTEMOTE_POUNCE = 121, - TEXTEMOTE_PRAISE = 122, - TEXTEMOTE_PURR = 123, - TEXTEMOTE_PUZZLE = 124, - TEXTEMOTE_RAISE = 125, - TEXTEMOTE_READY = 126, - TEXTEMOTE_SHIMMY = 127, - TEXTEMOTE_SHIVER = 128, - TEXTEMOTE_SHOO = 129, - TEXTEMOTE_SLAP = 130, - TEXTEMOTE_SMIRK = 131, - TEXTEMOTE_SNIFF = 132, - TEXTEMOTE_SNUB = 133, - TEXTEMOTE_SOOTHE = 134, - TEXTEMOTE_STINK = 135, - TEXTEMOTE_TAUNT = 136, - TEXTEMOTE_TEASE = 137, - TEXTEMOTE_THIRSTY = 138, - TEXTEMOTE_VETO = 139, - TEXTEMOTE_SNICKER = 140, - TEXTEMOTE_STAND = 141, - TEXTEMOTE_TICKLE = 142, - TEXTEMOTE_VIOLIN = 143, - TEXTEMOTE_SMILE = 163, - TEXTEMOTE_RASP = 183, - TEXTEMOTE_PITY = 203, - TEXTEMOTE_GROWL = 204, - TEXTEMOTE_BARK = 205, - TEXTEMOTE_SCARED = 223, - TEXTEMOTE_FLOP = 224, - TEXTEMOTE_LOVE = 225, - TEXTEMOTE_MOO = 226, - TEXTEMOTE_OPENFIRE = 327, - TEXTEMOTE_FLIRT = 328, - TEXTEMOTE_JOKE = 329, - TEXTEMOTE_COMMEND = 243, - TEXTEMOTE_WINK = 363, - TEXTEMOTE_PAT = 364, - TEXTEMOTE_SERIOUS = 365, - TEXTEMOTE_MOUNTSPECIAL = 366, - TEXTEMOTE_GOODLUCK = 367, - TEXTEMOTE_BLAME = 368, - TEXTEMOTE_BLANK = 369, - TEXTEMOTE_BRANDISH = 370, - TEXTEMOTE_BREATH = 371, - TEXTEMOTE_DISAGREE = 372, - TEXTEMOTE_DOUBT = 373, - TEXTEMOTE_EMBARRASS = 374, - TEXTEMOTE_ENCOURAGE = 375, - TEXTEMOTE_ENEMY = 376, - TEXTEMOTE_EYEBROW = 377, - TEXTEMOTE_TOAST = 378 + TEXT_EMOTE_AGREE = 1, + TEXT_EMOTE_AMAZE = 2, + TEXT_EMOTE_ANGRY = 3, + TEXT_EMOTE_APOLOGIZE = 4, + TEXT_EMOTE_APPLAUD = 5, + TEXT_EMOTE_BASHFUL = 6, + TEXT_EMOTE_BECKON = 7, + TEXT_EMOTE_BEG = 8, + TEXT_EMOTE_BITE = 9, + TEXT_EMOTE_BLEED = 10, + TEXT_EMOTE_BLINK = 11, + TEXT_EMOTE_BLUSH = 12, + TEXT_EMOTE_BONK = 13, + TEXT_EMOTE_BORED = 14, + TEXT_EMOTE_BOUNCE = 15, + TEXT_EMOTE_BRB = 16, + TEXT_EMOTE_BOW = 17, + TEXT_EMOTE_BURP = 18, + TEXT_EMOTE_BYE = 19, + TEXT_EMOTE_CACKLE = 20, + TEXT_EMOTE_CHEER = 21, + TEXT_EMOTE_CHICKEN = 22, + TEXT_EMOTE_CHUCKLE = 23, + TEXT_EMOTE_CLAP = 24, + TEXT_EMOTE_CONFUSED = 25, + TEXT_EMOTE_CONGRATULATE = 26, + TEXT_EMOTE_UNUSED = 27, + TEXT_EMOTE_COUGH = 28, + TEXT_EMOTE_COWER = 29, + TEXT_EMOTE_CRACK = 30, + TEXT_EMOTE_CRINGE = 31, + TEXT_EMOTE_CRY = 32, + TEXT_EMOTE_CURIOUS = 33, + TEXT_EMOTE_CURTSEY = 34, + TEXT_EMOTE_DANCE = 35, + TEXT_EMOTE_DRINK = 36, + TEXT_EMOTE_DROOL = 37, + TEXT_EMOTE_EAT = 38, + TEXT_EMOTE_EYE = 39, + TEXT_EMOTE_FART = 40, + TEXT_EMOTE_FIDGET = 41, + TEXT_EMOTE_FLEX = 42, + TEXT_EMOTE_FROWN = 43, + TEXT_EMOTE_GASP = 44, + TEXT_EMOTE_GAZE = 45, + TEXT_EMOTE_GIGGLE = 46, + TEXT_EMOTE_GLARE = 47, + TEXT_EMOTE_GLOAT = 48, + TEXT_EMOTE_GREET = 49, + TEXT_EMOTE_GRIN = 50, + TEXT_EMOTE_GROAN = 51, + TEXT_EMOTE_GROVEL = 52, + TEXT_EMOTE_GUFFAW = 53, + TEXT_EMOTE_HAIL = 54, + TEXT_EMOTE_HAPPY = 55, + TEXT_EMOTE_HELLO = 56, + TEXT_EMOTE_HUG = 57, + TEXT_EMOTE_HUNGRY = 58, + TEXT_EMOTE_KISS = 59, + TEXT_EMOTE_KNEEL = 60, + TEXT_EMOTE_LAUGH = 61, + TEXT_EMOTE_LAYDOWN = 62, + TEXT_EMOTE_MASSAGE = 63, + TEXT_EMOTE_MOAN = 64, + TEXT_EMOTE_MOON = 65, + TEXT_EMOTE_MOURN = 66, + TEXT_EMOTE_NO = 67, + TEXT_EMOTE_NOD = 68, + TEXT_EMOTE_NOSEPICK = 69, + TEXT_EMOTE_PANIC = 70, + TEXT_EMOTE_PEER = 71, + TEXT_EMOTE_PLEAD = 72, + TEXT_EMOTE_POINT = 73, + TEXT_EMOTE_POKE = 74, + TEXT_EMOTE_PRAY = 75, + TEXT_EMOTE_ROAR = 76, + TEXT_EMOTE_ROFL = 77, + TEXT_EMOTE_RUDE = 78, + TEXT_EMOTE_SALUTE = 79, + TEXT_EMOTE_SCRATCH = 80, + TEXT_EMOTE_SEXY = 81, + TEXT_EMOTE_SHAKE = 82, + TEXT_EMOTE_SHOUT = 83, + TEXT_EMOTE_SHRUG = 84, + TEXT_EMOTE_SHY = 85, + TEXT_EMOTE_SIGH = 86, + TEXT_EMOTE_SIT = 87, + TEXT_EMOTE_SLEEP = 88, + TEXT_EMOTE_SNARL = 89, + TEXT_EMOTE_SPIT = 90, + TEXT_EMOTE_STARE = 91, + TEXT_EMOTE_SURPRISED = 92, + TEXT_EMOTE_SURRENDER = 93, + TEXT_EMOTE_TALK = 94, + TEXT_EMOTE_TALKEX = 95, + TEXT_EMOTE_TALKQ = 96, + TEXT_EMOTE_TAP = 97, + TEXT_EMOTE_THANK = 98, + TEXT_EMOTE_THREATEN = 99, + TEXT_EMOTE_TIRED = 100, + TEXT_EMOTE_VICTORY = 101, + TEXT_EMOTE_WAVE = 102, + TEXT_EMOTE_WELCOME = 103, + TEXT_EMOTE_WHINE = 104, + TEXT_EMOTE_WHISTLE = 105, + TEXT_EMOTE_WORK = 106, + TEXT_EMOTE_YAWN = 107, + TEXT_EMOTE_BOGGLE = 108, + TEXT_EMOTE_CALM = 109, + TEXT_EMOTE_COLD = 110, + TEXT_EMOTE_COMFORT = 111, + TEXT_EMOTE_CUDDLE = 112, + TEXT_EMOTE_DUCK = 113, + TEXT_EMOTE_INSULT = 114, + TEXT_EMOTE_INTRODUCE = 115, + TEXT_EMOTE_JK = 116, + TEXT_EMOTE_LICK = 117, + TEXT_EMOTE_LISTEN = 118, + TEXT_EMOTE_LOST = 119, + TEXT_EMOTE_MOCK = 120, + TEXT_EMOTE_PONDER = 121, + TEXT_EMOTE_POUNCE = 122, + TEXT_EMOTE_PRAISE = 123, + TEXT_EMOTE_PURR = 124, + TEXT_EMOTE_PUZZLE = 125, + TEXT_EMOTE_RAISE = 126, + TEXT_EMOTE_READY = 127, + TEXT_EMOTE_SHIMMY = 128, + TEXT_EMOTE_SHIVER = 129, + TEXT_EMOTE_SHOO = 130, + TEXT_EMOTE_SLAP = 131, + TEXT_EMOTE_SMIRK = 132, + TEXT_EMOTE_SNIFF = 133, + TEXT_EMOTE_SNUB = 134, + TEXT_EMOTE_SOOTHE = 135, + TEXT_EMOTE_STINK = 136, + TEXT_EMOTE_TAUNT = 137, + TEXT_EMOTE_TEASE = 138, + TEXT_EMOTE_THIRSTY = 139, + TEXT_EMOTE_VETO = 140, + TEXT_EMOTE_SNICKER = 141, + TEXT_EMOTE_TICKLE = 142, + TEXT_EMOTE_STAND = 143, + TEXT_EMOTE_VIOLIN = 144, + TEXT_EMOTE_SMILE = 145, + TEXT_EMOTE_RASP = 146, + TEXT_EMOTE_GROWL = 147, + TEXT_EMOTE_BARK = 148, + TEXT_EMOTE_PITY = 149, + TEXT_EMOTE_SCARED = 150, + TEXT_EMOTE_FLOP = 151, + TEXT_EMOTE_LOVE = 152, + TEXT_EMOTE_MOO = 153, + TEXT_EMOTE_COMMEND = 154, + TEXT_EMOTE_TRAIN = 155, + TEXT_EMOTE_HELPME = 156, + TEXT_EMOTE_INCOMING = 157, + TEXT_EMOTE_OPENFIRE = 158, + TEXT_EMOTE_CHARGE = 159, + TEXT_EMOTE_FLEE = 160, + TEXT_EMOTE_ATTACKMYTARGET = 161, + TEXT_EMOTE_OOM = 162, + TEXT_EMOTE_FOLLOW = 163, + TEXT_EMOTE_WAIT = 164, + TEXT_EMOTE_FLIRT = 165, + TEXT_EMOTE_HEALME = 166, + TEXT_EMOTE_JOKE = 167, + TEXT_EMOTE_WINK = 168, + TEXT_EMOTE_PAT = 169, + TEXT_EMOTE_GOLFCLAP = 170, + TEXT_EMOTE_MOUNTSPECIAL = 171, + TEXT_EMOTE_INCOMING_2 = 304, + TEXT_EMOTE_FLEE_2 = 306, + TEXT_EMOTE_BLAME = 368, + TEXT_EMOTE_BLANK = 369, + TEXT_EMOTE_BRANDISH = 370, + TEXT_EMOTE_BREATH = 371, + TEXT_EMOTE_DISAGREE = 372, + TEXT_EMOTE_DOUBT = 373, + TEXT_EMOTE_EMBARRASS = 374, + TEXT_EMOTE_ENCOURAGE = 375, + TEXT_EMOTE_ENEMY = 376, + TEXT_EMOTE_EYEBROW = 377, + TEXT_EMOTE_HIGHFIVE = 380, + TEXT_EMOTE_ABSENT = 381, + TEXT_EMOTE_ARM = 382, + TEXT_EMOTE_AWE = 383, + TEXT_EMOTE_BACKPACK = 384, + TEXT_EMOTE_BADFEELING = 385, + TEXT_EMOTE_CHALLENGE = 386, + TEXT_EMOTE_CHUG = 387, + TEXT_EMOTE_DING = 389, + TEXT_EMOTE_FACEPALM = 390, + TEXT_EMOTE_FAINT = 391, + TEXT_EMOTE_GO = 392, + TEXT_EMOTE_GOING = 393, + TEXT_EMOTE_GLOWER = 394, + TEXT_EMOTE_HEADACHE = 395, + TEXT_EMOTE_HICCUP = 396, + TEXT_EMOTE_HISS = 398, + TEXT_EMOTE_HOLDHAND = 399, + TEXT_EMOTE_HURRY = 401, + TEXT_EMOTE_IDEA = 402, + TEXT_EMOTE_JEALOUS = 403, + TEXT_EMOTE_LUCK = 404, + TEXT_EMOTE_MAP = 405, + TEXT_EMOTE_MERCY = 406, + TEXT_EMOTE_MUTTER = 407, + TEXT_EMOTE_NERVOUS = 408, + TEXT_EMOTE_OFFER = 409, + TEXT_EMOTE_PET = 410, + TEXT_EMOTE_PINCH = 411, + TEXT_EMOTE_PROUD = 413, + TEXT_EMOTE_PROMISE = 414, + TEXT_EMOTE_PULSE = 415, + TEXT_EMOTE_PUNCH = 416, + TEXT_EMOTE_POUT = 417, + TEXT_EMOTE_REGRET = 418, + TEXT_EMOTE_REVENGE = 420, + TEXT_EMOTE_ROLLEYES = 421, + TEXT_EMOTE_RUFFLE = 422, + TEXT_EMOTE_SAD = 423, + TEXT_EMOTE_SCOFF = 424, + TEXT_EMOTE_SCOLD = 425, + TEXT_EMOTE_SCOWL = 426, + TEXT_EMOTE_SEARCH = 427, + TEXT_EMOTE_SHAKEFIST = 428, + TEXT_EMOTE_SHIFTY = 429, + TEXT_EMOTE_SHUDDER = 430, + TEXT_EMOTE_SIGNAL = 431, + TEXT_EMOTE_SILENCE = 432, + TEXT_EMOTE_SING = 433, + TEXT_EMOTE_SMACK = 434, + TEXT_EMOTE_SNEAK = 435, + TEXT_EMOTE_SNEEZE = 436, + TEXT_EMOTE_SNORT = 437, + TEXT_EMOTE_SQUEAL = 438, + TEXT_EMOTE_SUSPICIOUS = 440, + TEXT_EMOTE_THINK = 441, + TEXT_EMOTE_TRUCE = 442, + TEXT_EMOTE_TWIDDLE = 443, + TEXT_EMOTE_WARN = 444, + TEXT_EMOTE_SNAP = 445, + TEXT_EMOTE_CHARM = 446, + TEXT_EMOTE_COVEREARS = 447, + TEXT_EMOTE_CROSSARMS = 448, + TEXT_EMOTE_LOOK = 449, + TEXT_EMOTE_OBJECT = 450, + TEXT_EMOTE_SWEAT = 451, + TEXT_EMOTE_YW = 452, }; enum Emote diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 4d78ef993bf..c71394227f0 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -262,22 +262,22 @@ public: { switch(emote) { - case TEXTEMOTE_DANCE: + case TEXT_EMOTE_DANCE: EnterEvadeMode(); break; - case TEXTEMOTE_RUDE: + case TEXT_EMOTE_RUDE: if (me->IsWithinDistInMap(pPlayer, 5)) DoCast(pPlayer, SPELL_SLAP, false); else me->HandleEmoteCommand(EMOTE_ONESHOT_RUDE); break; - case TEXTEMOTE_WAVE: + case TEXT_EMOTE_WAVE: me->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); break; - case TEXTEMOTE_BOW: + case TEXT_EMOTE_BOW: me->HandleEmoteCommand(EMOTE_ONESHOT_BOW); break; - case TEXTEMOTE_KISS: + case TEXT_EMOTE_KISS: me->HandleEmoteCommand(EMOTE_ONESHOT_FLEX); break; } diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index 85609aab584..2a495d6e246 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -150,10 +150,10 @@ class example_creature : public CreatureScript switch(uiTextEmote) { - case TEXTEMOTE_DANCE: + case TEXT_EMOTE_DANCE: DoScriptText(SAY_DANCE, me); break; - case TEXTEMOTE_SALUTE: + case TEXT_EMOTE_SALUTE: DoScriptText(SAY_SALUTE, me); break; } 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; 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) |