diff options
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Outland/BlackTemple/boss_illidan.cpp | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index d786d322453..97f81e4ab52 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -128,7 +128,7 @@ static SpiritInfoStruct SpiritInfo[] = struct TransformStruct { uint32 sound; - std::string text; + const char* text; uint32 spell, unaura; }; @@ -353,7 +353,7 @@ class boss_zuljin : public CreatureScript me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, 0); me->RemoveAurasDueToSpell(Transform[Phase].unaura); DoCast(me, Transform[Phase].spell); - me->MonsterYell(Transform[Phase].text.c_str(), LANG_UNIVERSAL, NULL); + me->MonsterYell(Transform[Phase].text, LANG_UNIVERSAL, NULL); DoPlaySoundToSet(me, Transform[Phase].sound); if (Phase > 0) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index d3749f147a9..8b82b696a49 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -243,7 +243,7 @@ static EventIllidan MaxTimer[]= struct Yells { uint32 sound; - std::string text; + const char* text; uint32 pCreature, timer, emote; bool Talk; }; @@ -629,8 +629,8 @@ public: { if (Conversation[count].emote) pCreature->HandleEmoteCommand(Conversation[count].emote); // Make the Creature do some animation! - if (Conversation[count].text.size()) - pCreature->MonsterYell(Conversation[count].text.c_str(), LANG_UNIVERSAL, 0); // Have the Creature yell out some text + if (Conversation[count].text) + pCreature->MonsterYell(Conversation[count].text, LANG_UNIVERSAL, 0); // Have the Creature yell out some text if (Conversation[count].sound) DoPlaySoundToSet(pCreature, Conversation[count].sound); // Play some sound on the creature } @@ -1017,8 +1017,8 @@ public: { uint32 random = rand()%4; uint32 soundid = RandomTaunts[random].sound; - if (RandomTaunts[random].text.size()) - me->MonsterYell(RandomTaunts[random].text.c_str(), LANG_UNIVERSAL, 0); + if (RandomTaunts[random].text) + me->MonsterYell(RandomTaunts[random].text, LANG_UNIVERSAL, 0); if (soundid) DoPlaySoundToSet(me, soundid); } @@ -1318,8 +1318,8 @@ public: { uint32 random = rand()%4; uint32 sound = MaievTaunts[random].sound; - if (MaievTaunts[random].text.size()) - me->MonsterYell(MaievTaunts[random].text.c_str(), LANG_UNIVERSAL, 0); + if (MaievTaunts[random].text) + me->MonsterYell(MaievTaunts[random].text, LANG_UNIVERSAL, 0); DoPlaySoundToSet(me, sound); Timer[EVENT_MAIEV_TAUNT] = 22000 + rand()%21 * 1000; } |