aboutsummaryrefslogtreecommitdiff
path: root/src/game/ChannelMgr.cpp
diff options
context:
space:
mode:
authorRat <none@none>2009-12-20 15:20:04 +0100
committerRat <none@none>2009-12-20 15:20:04 +0100
commit6fe36efe0f2a05421965ad57c69b2f950a2cdb72 (patch)
treed8377347f5ae67a042d37b52b4eabf2bd4aa32bf /src/game/ChannelMgr.cpp
parentbaa264e6150700e54a9ba6995d16a6d5af2c0dee (diff)
*apply trinity style to whole source
*comment out all mangos to trinity defines *this will make merging a little harder, but code will be more clear --HG-- branch : trunk
Diffstat (limited to 'src/game/ChannelMgr.cpp')
-rw-r--r--src/game/ChannelMgr.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/ChannelMgr.cpp b/src/game/ChannelMgr.cpp
index 16a236a1f95..90c1b62f69a 100644
--- a/src/game/ChannelMgr.cpp
+++ b/src/game/ChannelMgr.cpp
@@ -26,12 +26,12 @@ INSTANTIATE_SINGLETON_1( HordeChannelMgr );
ChannelMgr* channelMgr(uint32 team)
{
if (sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
- return &MaNGOS::Singleton<AllianceChannelMgr>::Instance(); // cross-faction
+ return &Trinity::Singleton<AllianceChannelMgr>::Instance(); // cross-faction
if(team == ALLIANCE)
- return &MaNGOS::Singleton<AllianceChannelMgr>::Instance();
+ return &Trinity::Singleton<AllianceChannelMgr>::Instance();
if(team == HORDE)
- return &MaNGOS::Singleton<HordeChannelMgr>::Instance();
+ return &Trinity::Singleton<HordeChannelMgr>::Instance();
return NULL;
}