aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Battlefield/Battlefield.cpp
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2012-09-10 13:03:38 +0200
committerSpp <spp@jorge.gr>2012-09-10 13:04:31 +0200
commit358c6a26d6cfea2bbfabee5a663c3a09056526c2 (patch)
tree93db6596bdbe27a470ce0ffd33ade863e1a8c068 /src/server/game/Battlefield/Battlefield.cpp
parent1efd2f9e333120b35ae910e19e03ddd1202e2775 (diff)
Core: Warning fixes (Also some -pedantic under game folder)
Diffstat (limited to 'src/server/game/Battlefield/Battlefield.cpp')
-rw-r--r--src/server/game/Battlefield/Battlefield.cpp6
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();
}