diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:13:41 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-11 01:13:41 +0100 |
| commit | b1c4118a33f669f8be7131c7d37b34dbe63ff545 (patch) | |
| tree | 468fdf51066947dd8254753ee98163be97d0d0b8 /src/server/game/Battlefield/Battlefield.cpp | |
| parent | f237a57f51c0473bda90bae7a06bd5b9c187754b (diff) | |
| parent | 8d049545de87595a84e6e2c54d7b44b354644144 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'src/server/game/Battlefield/Battlefield.cpp')
| -rw-r--r-- | src/server/game/Battlefield/Battlefield.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index cd1f64d629f..ae58f3504b4 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -463,7 +463,7 @@ void Battlefield::SendWarningToAllInZone(uint32 entry) if (Unit* unit = sObjectAccessor->FindUnit(StalkerGuid)) if (Creature* stalker = unit->ToCreature()) // FIXME: replaced CHAT_TYPE_END with CHAT_MSG_BG_SYSTEM_NEUTRAL to fix compile, it's a guessed change :/ - sCreatureTextMgr->SendChat(stalker, (uint8) entry, NULL, CHAT_MSG_BG_SYSTEM_NEUTRAL, LANG_ADDON, TEXT_RANGE_ZONE); + sCreatureTextMgr->SendChat(stalker, (uint8) entry, 0, CHAT_MSG_BG_SYSTEM_NEUTRAL, LANG_ADDON, TEXT_RANGE_ZONE); } /*void Battlefield::SendWarningToAllInWar(int32 entry,...) @@ -676,8 +676,8 @@ BfGraveyard::BfGraveyard(Battlefield* battlefield) m_Bf = battlefield; m_GraveyardId = 0; m_ControlTeam = TEAM_NEUTRAL; - m_SpiritGuide[0] = NULL; - m_SpiritGuide[1] = NULL; + m_SpiritGuide[0] = 0; + m_SpiritGuide[1] = 0; m_ResurrectQueue.clear(); } |