diff options
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
| -rwxr-xr-x | src/server/game/Scripting/ScriptMgr.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index d37938eba48..120227c172d 100755 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -155,7 +155,7 @@ class ScriptRegistry if (!V) \ return R; -void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget) +void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* target) { if (!pSource) { @@ -198,21 +198,21 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget) switch (pData->uiType) { case CHAT_TYPE_SAY: - pSource->MonsterSay(iTextEntry, pData->uiLanguage, pTarget ? pTarget->GetGUID() : 0); + pSource->MonsterSay(iTextEntry, pData->uiLanguage, target ? target->GetGUID() : 0); break; case CHAT_TYPE_YELL: - pSource->MonsterYell(iTextEntry, pData->uiLanguage, pTarget ? pTarget->GetGUID() : 0); + pSource->MonsterYell(iTextEntry, pData->uiLanguage, target ? target->GetGUID() : 0); break; case CHAT_TYPE_TEXT_EMOTE: - pSource->MonsterTextEmote(iTextEntry, pTarget ? pTarget->GetGUID() : 0); + pSource->MonsterTextEmote(iTextEntry, target ? target->GetGUID() : 0); break; case CHAT_TYPE_BOSS_EMOTE: - pSource->MonsterTextEmote(iTextEntry, pTarget ? pTarget->GetGUID() : 0, true); + pSource->MonsterTextEmote(iTextEntry, target ? target->GetGUID() : 0, true); break; case CHAT_TYPE_WHISPER: { - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) - pSource->MonsterWhisper(iTextEntry, pTarget->GetGUID()); + if (target && target->GetTypeId() == TYPEID_PLAYER) + pSource->MonsterWhisper(iTextEntry, target->GetGUID()); else sLog->outError("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry); @@ -220,15 +220,15 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget) } case CHAT_TYPE_BOSS_WHISPER: { - if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) - pSource->MonsterWhisper(iTextEntry, pTarget->GetGUID(), true); + if (target && target->GetTypeId() == TYPEID_PLAYER) + pSource->MonsterWhisper(iTextEntry, target->GetGUID(), true); else sLog->outError("TSCR: DoScriptText entry %i cannot whisper without target unit (TYPEID_PLAYER).", iTextEntry); break; } case CHAT_TYPE_ZONE_YELL: - pSource->MonsterYellToZone(iTextEntry, pData->uiLanguage, pTarget ? pTarget->GetGUID() : 0); + pSource->MonsterYellToZone(iTextEntry, pData->uiLanguage, target ? target->GetGUID() : 0); break; } } |