diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-09-19 15:19:53 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-09-19 15:19:53 +0100 |
| commit | c678eaa71e6ad57866ba061af948b157d3232e6b (patch) | |
| tree | 2c217a92d4a3e9ce8292f89cff346fc4a6586cd5 /src | |
| parent | 878b7d38111599a3033b7f6fb9460eb69a5d7bf2 (diff) | |
Core/MapScripts: Use proper enum value for boss whisper in SCRIPT_COMMAND_TALK
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Scripting/MapScripts.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index 7c24c59c334..8a49878aa50 100644 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -374,7 +374,7 @@ void Map::ScriptsProcess() { case SCRIPT_COMMAND_TALK: { - if (step.script->Talk.ChatType > CHAT_TYPE_WHISPER && step.script->Talk.ChatType != CHAT_MSG_RAID_BOSS_WHISPER) + if (step.script->Talk.ChatType > CHAT_TYPE_BOSS_WHISPER) { TC_LOG_ERROR("scripts", "%s invalid chat type (%u) specified, skipping.", step.script->GetDebugInfo().c_str(), step.script->Talk.ChatType); break; @@ -407,13 +407,13 @@ void Map::ScriptsProcess() sourceUnit->TextEmote(step.script->Talk.TextID, target, step.script->Talk.ChatType == CHAT_TYPE_BOSS_EMOTE); break; case CHAT_TYPE_WHISPER: - case CHAT_MSG_RAID_BOSS_WHISPER: + case CHAT_TYPE_BOSS_WHISPER: { Player* receiver = target ? target->ToPlayer() : nullptr; if (!receiver) TC_LOG_ERROR("scripts", "%s attempt to whisper to non-player unit, skipping.", step.script->GetDebugInfo().c_str()); else - sourceUnit->Whisper(step.script->Talk.TextID, receiver, step.script->Talk.ChatType == CHAT_MSG_RAID_BOSS_WHISPER); + sourceUnit->Whisper(step.script->Talk.TextID, receiver, step.script->Talk.ChatType == CHAT_TYPE_BOSS_WHISPER); break; } default: |