diff options
author | Rat <none@none> | 2009-12-20 15:20:04 +0100 |
---|---|---|
committer | Rat <none@none> | 2009-12-20 15:20:04 +0100 |
commit | 6fe36efe0f2a05421965ad57c69b2f950a2cdb72 (patch) | |
tree | d8377347f5ae67a042d37b52b4eabf2bd4aa32bf /src/game/ChatHandler.cpp | |
parent | baa264e6150700e54a9ba6995d16a6d5af2c0dee (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/ChatHandler.cpp')
-rw-r--r-- | src/game/ChatHandler.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp index 44eba0e8ccd..dd39dd72190 100644 --- a/src/game/ChatHandler.cpp +++ b/src/game/ChatHandler.cpp @@ -588,7 +588,7 @@ void WorldSession::HandleEmoteOpcode( WorldPacket & recv_data ) GetPlayer()->HandleEmoteCommand(emote); } -namespace MaNGOS +namespace Trinity { class EmoteChatBuilder { @@ -618,7 +618,7 @@ namespace MaNGOS uint32 i_emote_num; Unit const* i_target; }; -} // namespace MaNGOS +} // namespace Trinity void WorldSession::HandleTextEmoteOpcode( WorldPacket & recv_data ) { @@ -659,16 +659,16 @@ void WorldSession::HandleTextEmoteOpcode( WorldPacket & recv_data ) Unit* unit = ObjectAccessor::GetUnit(*_player, guid); - CellPair p = MaNGOS::ComputeCellPair(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY()); + CellPair p = Trinity::ComputeCellPair(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY()); Cell cell(p); cell.data.Part.reserved = ALL_DISTRICT; cell.SetNoCreate(); - MaNGOS::EmoteChatBuilder emote_builder(*GetPlayer(), text_emote, emoteNum, unit); - MaNGOS::LocalizedPacketDo<MaNGOS::EmoteChatBuilder > emote_do(emote_builder); - MaNGOS::PlayerDistWorker<MaNGOS::LocalizedPacketDo<MaNGOS::EmoteChatBuilder > > emote_worker(GetPlayer(),sWorld.getConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE),emote_do); - TypeContainerVisitor<MaNGOS::PlayerDistWorker<MaNGOS::LocalizedPacketDo<MaNGOS::EmoteChatBuilder > >, WorldTypeMapContainer > message(emote_worker); + Trinity::EmoteChatBuilder emote_builder(*GetPlayer(), text_emote, emoteNum, unit); + Trinity::LocalizedPacketDo<Trinity::EmoteChatBuilder > emote_do(emote_builder); + Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::EmoteChatBuilder > > emote_worker(GetPlayer(),sWorld.getConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE),emote_do); + TypeContainerVisitor<Trinity::PlayerDistWorker<Trinity::LocalizedPacketDo<Trinity::EmoteChatBuilder > >, WorldTypeMapContainer > message(emote_worker); CellLock<GridReadGuard> cell_lock(cell, p); cell_lock->Visit(cell_lock, message, *GetPlayer()->GetMap(), *GetPlayer(), sWorld.getConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE)); |