*Merge.

--HG--
branch : trunk

src/game/AccountMgr.cpp

@@ -221,3 +221,4 @@ bool AccountMgr::normilizeString(std::string& utf8str)
 
     return WStrToUtf8(wstr_buf,wstr_len,utf8str);
 }
+

src/game/AccountMgr.h

@@ -58,3 +58,4 @@ class AccountMgr
 
 #define accmgr Trinity::Singleton<AccountMgr>::Instance()
 #endif
+

src/game/AddonHandler.cpp

@@ -208,3 +208,4 @@ void AddonHandler::BuildAddonPacket(WorldPacket* Source, WorldPacket* Target, ui
     }
 }
 */
+

src/game/AddonHandler.h

@@ -37,3 +37,4 @@ class AddonHandler
 };
 #define sAddOnHandler Trinity::Singleton<AddonHandler>::Instance()
 #endif
+

src/game/AggressorAI.cpp

@@ -113,3 +113,4 @@ AggressorAI::UpdateAI(const uint32 /*diff*/)
         }
     }
 }
+

src/game/AggressorAI.h

@@ -50,3 +50,4 @@ class TRINITY_DLL_DECL AggressorAI : public CreatureAI
         TimeTracker i_tracker;
 };
 #endif
+

src/game/AnimalRandomMovementGenerator.h

@@ -28,3 +28,4 @@
  *  animal creatures.
  */
 #endif
+

src/game/ArenaTeam.cpp

@@ -662,3 +662,4 @@ arenateam fields (id from 2.3.3 client):
 1430 - unk - rank?
 1431 - personal arena rating
 */
+

src/game/ArenaTeam.h

@@ -235,3 +235,4 @@ class ArenaTeam
         ArenaTeamStats stats;
 };
 #endif
+

src/game/ArenaTeamHandler.cpp

@@ -438,3 +438,4 @@ ERR_ARENA_TEAM_TOO_MANY_MEMBERS_S "%s is full"
 
 ERR_ARENA_TEAM_LEVEL_TOO_LOW_I "You must be level %d to form an arena team"
 */
+

src/game/AuctionHouse.cpp

@@ -756,3 +756,4 @@ void WorldSession::HandleAuctionListItems( WorldPacket & recv_data )
     data << (uint32) 300;                                   // unk 2.3.0 const?
     SendPacket(&data);
 }
+

src/game/AuctionHouseBot.cpp

@@ -1196,3 +1196,4 @@ void AuctionHouseBotLoadValues(AHBConfig *config)
         {sLog.outError("buyerBidsPerInterval = %u", config->GetBidsPerInterval());}
     }
 }
+

src/game/AuctionHouseBot.h

@@ -685,3 +685,4 @@ void AuctionHouseBotInit();
 void AuctionHouseBotLoadValues(AHBConfig*);
 void AuctionHouseBotCommands(uint32, uint32, uint32, char*);
 #endif
+

src/game/AuctionHouseObject.h

@@ -104,3 +104,4 @@ class AuctionHouseObject
         AuctionEntryMap AuctionsMap;
 };
 #endif
+

src/game/Bag.cpp

@@ -224,3 +224,4 @@ Item* Bag::GetItemByPos( uint8 slot ) const
 
     return NULL;
 }
+

src/game/Bag.h

@@ -75,3 +75,4 @@ inline Item* NewItemOrBag(ItemPrototype const * proto)
     return (proto->InventoryType == INVTYPE_BAG) ? new Bag : new Item;
 }
 #endif
+

src/game/BattleGround.cpp

@@ -1564,3 +1564,4 @@ int32 BattleGround::GetObjectType(uint64 guid)
 void BattleGround::HandleKillUnit(Creature *creature, Player *killer)
 {
 }
+

src/game/BattleGround.h

@@ -554,3 +554,4 @@ class BattleGround
         float m_TeamStartLocO[2];
 };
 #endif
+

src/game/BattleGroundAA.cpp

@@ -63,3 +63,4 @@ bool BattleGroundAA::SetupBattleGround()
 {
     return true;
 }
+

src/game/BattleGroundAA.h

@@ -47,3 +47,4 @@ class BattleGroundAA : public BattleGround
         void HandleKillPlayer(Player* player, Player *killer);
 };
 #endif
+

src/game/BattleGroundAB.cpp

@@ -671,3 +671,4 @@ void BattleGroundAB::UpdatePlayerScore(Player *Source, uint32 type, uint32 value
             break;
     }
 }
+

src/game/BattleGroundAB.h

@@ -284,3 +284,4 @@ class BattleGroundAB : public BattleGround
         bool              m_IsInformedNearVictory;
 };
 #endif
+

src/game/BattleGroundAV.cpp

@@ -1445,3 +1445,4 @@ void BattleGroundAV::ResetBGSubclass()
 
 }
 
+

src/game/BattleGroundAV.h

@@ -1579,3 +1579,4 @@ class BattleGroundAV : public BattleGround
 };
 
 #endif
+

src/game/BattleGroundBE.cpp

@@ -251,3 +251,4 @@ spell 32725 - Green Team
 35774 Gold Team
 35775 Green Team
 */
+

src/game/BattleGroundBE.h

@@ -74,3 +74,4 @@ class BattleGroundBE : public BattleGround
         void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
 };
 #endif
+

src/game/BattleGroundEY.cpp

@@ -940,3 +940,4 @@ WorldSafeLocsEntry const *BattleGroundEY::GetClosestGraveYard(float x, float y,
 
     return nearestEntry;
 }
+

src/game/BattleGroundEY.h

@@ -372,3 +372,4 @@ class BattleGroundEY : public BattleGround
         int32 m_PointAddingTimer;
 };
 #endif
+

src/game/BattleGroundHandler.cpp

@@ -859,3 +859,4 @@ void WorldSession::SendBattleGroundOrArenaJoinError(uint8 err)
     SendPacket(&data);
     return;
 }
+

src/game/BattleGroundMgr.cpp

@@ -1768,3 +1768,4 @@ void BattleGroundMgr::SetHolidayWeekends(uint32 mask)
         }
     }
 }
+

src/game/BattleGroundMgr.h

@@ -251,3 +251,4 @@ class BattleGroundMgr
 
 #define sBattleGroundMgr Trinity::Singleton<BattleGroundMgr>::Instance()
 #endif
+

src/game/BattleGroundNA.cpp

@@ -226,3 +226,4 @@ bool BattleGroundNA::SetupBattleGround()
 0040: 00 00 00 00 00 00 d5 08 00 00 00 00 00 00 d3 08  |  ................
 0050: 00 00 00 00 00 00                                |  ......
 */
+

src/game/BattleGroundNA.h

@@ -72,3 +72,4 @@ class BattleGroundNA : public BattleGround
         bool HandlePlayerUnderMap(Player * plr);
 };
 #endif
+

src/game/BattleGroundRL.cpp

@@ -226,3 +226,4 @@ Packet S->C, id 600, SMSG_INIT_WORLD_STATES (706), len 86
 0040: 00 00 00 00 00 00 D3 08 00 00 00 00 00 00 D4 08 | ................
 0050: 00 00 00 00 00 00                               | ......
 */
+

src/game/BattleGroundRL.h

@@ -68,3 +68,4 @@ class BattleGroundRL : public BattleGround
         bool HandlePlayerUnderMap(Player * plr);
 };
 #endif
+

src/game/BattleGroundWS.cpp

@@ -736,3 +736,4 @@ void BattleGroundWS::FillInitialWorldStates(WorldPacket& data)
         data << uint32(BG_WS_FLAG_STATE_HORDE) << uint32(1);
 
 }
+

src/game/BattleGroundWS.h

@@ -185,3 +185,4 @@ class BattleGroundWS : public BattleGround
         int32 m_FlagsDropTimer[2];
 };
 #endif
+

src/game/Cell.h

@@ -163,3 +163,4 @@ struct TRINITY_DLL_DECL CellLock
     }
 };
 #endif
+

src/game/CellImpl.h

@@ -178,3 +178,4 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi
     }
 }
 #endif
+

src/game/Channel.cpp

@@ -989,3 +989,4 @@ void Channel::LeaveNotify(uint64 guid)
     data << GetName();
     SendToAll(&data);
 }
+

src/game/Channel.h

@@ -285,3 +285,4 @@ class Channel
         void LeaveNotify(uint64 guid);                                          // invisible notify
 };
 #endif
+

src/game/ChannelHandler.cpp

@@ -387,3 +387,4 @@ void WorldSession::HandleChannelJoinNotify(WorldPacket &recvPacket)
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->JoinNotify(_player->GetGUID());*/
 }
+

src/game/ChannelMgr.h

@@ -101,3 +101,4 @@ inline ChannelMgr* channelMgr(uint32 team)
     return NULL;
 }
 #endif
+

src/game/CharacterHandler.cpp

@@ -1087,3 +1087,4 @@ void WorldSession::HandleDeclinedPlayerNameOpcode(WorldPacket& recv_data)
     data << uint64(guid);
     SendPacket(&data);
 }
+

src/game/Chat.cpp

@@ -1395,3 +1395,4 @@ bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player* &plr, G
 
     return true;
 }
+

src/game/Chat.h

@@ -537,3 +537,4 @@ class CliHandler : public ChatHandler
 char const *fmtstring( char const *format, ... );
 
 #endif
+

src/game/ChatHandler.cpp

@@ -588,3 +588,4 @@ void WorldSession::HandleChannelDeclineInvite(WorldPacket &recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
 }
+

src/game/CombatHandler.cpp

@@ -95,3 +95,4 @@ void WorldSession::SendAttackStop(Unit const* enemy)
     data << uint32(0);                                      // unk, can be 1 also
     SendPacket(&data);
 }
+

src/game/ConfusedMovementGenerator.cpp

@@ -161,3 +161,4 @@ template void ConfusedMovementGenerator<Player>::Reset(Player &player);
 template void ConfusedMovementGenerator<Creature>::Reset(Creature &creature);
 template bool ConfusedMovementGenerator<Player>::Update(Player &player, const uint32 &diff);
 template bool ConfusedMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff);
+

src/game/ConfusedMovementGenerator.h

@@ -55,3 +55,4 @@ class TRINITY_DLL_SPEC ConfusedMovementGenerator
         uint32 i_nextMove;
 };
 #endif
+

src/game/Corpse.cpp

@@ -213,3 +213,4 @@ bool Corpse::isVisibleForInState(Player const* u, bool inVisibleList) const
 {
     return IsInWorld() && u->IsInWorld() && IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false);
 }
+

src/game/Corpse.h

@@ -100,3 +100,4 @@ class Corpse : public WorldObject
         GridPair m_grid;                                    // gride for corpse position for fast search
 };
 #endif
+

src/game/Creature.cpp

@@ -2335,3 +2335,4 @@ const char* Creature::GetNameForLocaleIdx(int32 loc_idx) const
 
     return GetName();
 }
+

src/game/Creature.h

@@ -711,3 +711,4 @@ class AssistDelayEvent : public BasicEvent
 };
 
 #endif
+

src/game/CreatureAI.cpp

@@ -100,3 +100,4 @@ void SimpleCharmedAI::UpdateAI(const uint32 /*diff*/)
     if(!target || !charmer->canAttack(target))
         AttackStart(charmer->SelectNearestTarget());
 }
+

src/game/CreatureAI.h

@@ -174,3 +174,4 @@ typedef FactoryHolder<CreatureAI> CreatureAICreator;
 typedef FactoryHolder<CreatureAI>::FactoryHolderRegistry CreatureAIRegistry;
 typedef FactoryHolder<CreatureAI>::FactoryHolderRepository CreatureAIRepository;
 #endif
+

src/game/CreatureAIImpl.h

@@ -30,3 +30,4 @@ CreatureAIFactory<REAL_AI>::Create(void *data) const
     return (new REAL_AI(creature));
 }
 #endif
+

src/game/CreatureAIRegistry.cpp

@@ -53,3 +53,4 @@ namespace AIRegistry
         (new MovementGeneratorFactory<WaypointMovementGenerator<Creature> >(WAYPOINT_MOTION_TYPE))->RegisterSelf();
     }
 }
+

src/game/CreatureAIRegistry.h

@@ -26,3 +26,4 @@ namespace AIRegistry
     void Initialize(void);
 }
 #endif
+

src/game/CreatureAISelector.cpp

@@ -125,3 +125,4 @@ namespace FactorySelector
 
     }
 }
+

src/game/CreatureAISelector.h

@@ -31,3 +31,4 @@ namespace FactorySelector
     MovementGenerator* selectMovementGenerator(Creature *);
 }
 #endif
+

src/game/CreatureGroups.cpp

@@ -212,3 +212,4 @@ void CreatureGroup::SetMemberDestination(Creature *member)
         member->GetMotionMaster()->MovePoint(0, x, y, z);
     }
 }
+

src/game/CreatureGroups.h

@@ -66,3 +66,4 @@ extern UNORDERED_MAP<uint32, FormationMember*> CreatureGroupMap;
 #define formation_mgr Trinity::Singleton<CreatureGroupManager>::Instance()
 
 #endif
+

src/game/Debugcmds.cpp

@@ -570,3 +570,4 @@ bool ChatHandler::HandleDebugHostilRefList(const char * /*args*/)
     SendSysMessage("End of hostil reference list.");
     return true;
 }
+

src/game/DestinationHolder.cpp

@@ -19,3 +19,4 @@
  */
 
 #include "DestinationHolder.h"
+

src/game/DestinationHolder.h

@@ -62,3 +62,4 @@ class TRINITY_DLL_DECL DestinationHolder
 
 };
 #endif
+

src/game/DestinationHolderImp.h

@@ -247,3 +247,4 @@ DestinationHolder<TRAVELLER>::GetLocationNowNoMicroMovement(float &x, float &y,
 }
 
 #endif
+

src/game/DuelHandler.cpp

@@ -90,3 +90,4 @@ void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket)
 
     GetPlayer()->DuelComplete(DUEL_INTERUPTED);
 }
+

src/game/DynamicObject.cpp

@@ -154,3 +154,4 @@ bool DynamicObject::isVisibleForInState(Player const* u, bool inVisibleList) con
         && (IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false)
         || GetCasterGUID() == u->GetGUID());
 }
+

src/game/DynamicObject.h

@@ -73,3 +73,4 @@ class DynamicObject : public WorldObject
         GridReference<DynamicObject> m_gridRef;
 };
 #endif
+

src/game/FleeingMovementGenerator.cpp

@@ -402,3 +402,4 @@ template void FleeingMovementGenerator<Player>::Reset(Player &);
 template void FleeingMovementGenerator<Creature>::Reset(Creature &);
 template bool FleeingMovementGenerator<Player>::Update(Player &, const uint32 &);
 template bool FleeingMovementGenerator<Creature>::Update(Creature &, const uint32 &);
+

src/game/FleeingMovementGenerator.h

@@ -63,3 +63,4 @@ class TRINITY_DLL_SPEC FleeingMovementGenerator
         DestinationHolder< Traveller<T> > i_destinationHolder;
 };
 #endif
+

src/game/FollowerRefManager.h

@@ -31,3 +31,4 @@ class FollowerRefManager : public RefManager<Unit, TargetedMovementGeneratorBase
 
 };
 #endif
+

src/game/FollowerReference.cpp

@@ -36,3 +36,4 @@ void FollowerReference::sourceObjectDestroyLink()
 {
     getSource()->stopFollowing();
 }
+

src/game/FollowerReference.h

@@ -34,3 +34,4 @@ class TRINITY_DLL_SPEC FollowerReference : public Reference<Unit, TargetedMoveme
         void sourceObjectDestroyLink();
 };
 #endif
+

src/game/Formulas.h

@@ -206,3 +206,4 @@ namespace Trinity
     }
 }
 #endif
+

src/game/GameEvent.cpp

@@ -1532,3 +1532,4 @@ void GameEvent::SendWorldStateUpdate(Player * plr, uint16 event_id)
             plr->SendUpdateWorldState(itr->second.max_world_state, (uint32)(itr->second.reqNum));
     }
 }
+

src/game/GameEvent.h

@@ -160,3 +160,4 @@ class GameEvent
 
 #define gameeventmgr Trinity::Singleton<GameEvent>::Instance()
 #endif
+

src/game/GameObject.cpp

@@ -1331,3 +1331,4 @@ const char* GameObject::GetNameForLocaleIdx(int32 loc_idx) const
 
     return GetName();
 }
+

src/game/GameObject.h

@@ -600,3 +600,4 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
         GridReference<GameObject> m_gridRef;
 };
 #endif
+

src/game/GlobalEvents.cpp

@@ -86,3 +86,4 @@ void CorpsesErase()
     CorpsesErase(true, 20*MINUTE);
     CorpsesErase(false,3*DAY);
 }
+

src/game/GlobalEvents.h

@@ -29,3 +29,4 @@ void CorpsesErase();
 void HandleCorpsesErase(void*);
 #endif
 /// @}
+

src/game/GossipDef.cpp

@@ -763,3 +763,4 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID
     pSession->SendPacket( &data );
     sLog.outDebug( "WORLD: Sent SMSG_QUESTGIVER_REQUEST_ITEMS NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), pQuest->GetQuestId() );
 }
+

src/game/GossipDef.h

@@ -206,3 +206,4 @@ class TRINITY_DLL_SPEC PlayerMenu
         void SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID, bool Completable, bool CloseOnCancel );
 };
 #endif
+

src/game/GridDefines.h

@@ -188,3 +188,4 @@ namespace Trinity
     }
 }
 #endif
+

src/game/GridNotifiers.cpp

@@ -268,3 +268,4 @@ bool CannibalizeObjectCheck::operator()(Corpse* u)
 
     return false;
 }
+

src/game/GridNotifiers.h

@@ -977,3 +977,4 @@ namespace Trinity
     #endif
 }
 #endif
+

src/game/GridNotifiersImpl.h

@@ -489,3 +489,4 @@ void Trinity::PlayerSearcher<Check>::Visit(PlayerMapType &m)
 }
 
 #endif                                                      // TRINITY_GRIDNOTIFIERSIMPL_H
+

src/game/GridStates.cpp

@@ -73,3 +73,4 @@ RemovalState::Update(Map &m, NGridType &grid, GridInfo &info, const uint32 &x, c
         }
     }
 }
+

src/game/GridStates.h

@@ -73,3 +73,4 @@ class TRINITY_DLL_DECL RemovalState : public GridState
         void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const;
 };
 #endif
+

src/game/Group.cpp

@@ -1537,4 +1537,5 @@ void Group::BroadcastGroupUpdate(void)
             DEBUG_LOG("-- Forced group value update for '%s'", pp->GetName());
         }
     }
-}
+}
+

src/game/Group.h

@@ -411,3 +411,4 @@ class TRINITY_DLL_SPEC Group
         uint8*              m_subGroupsCounts;
 };
 #endif
+

src/game/GroupHandler.cpp

@@ -943,3 +943,4 @@ void WorldSession::HandleGroupPassOnLootOpcode( WorldPacket & recv_data )
     if(unkn!=0)
         sLog.outError("CMSG_GROUP_PASS_ON_LOOT: activation not implemented!");
 }
+

src/game/GroupRefManager.h

@@ -33,3 +33,4 @@ class GroupRefManager : public RefManager<Group, Player>
         GroupReference* getFirst() { return ((GroupReference* ) RefManager<Group, Player>::getFirst()); }
 };
 #endif
+

src/game/GroupReference.cpp

@@ -39,3 +39,4 @@ void GroupReference::sourceObjectDestroyLink()
     // called from invalidate()
     getTarget()->DelinkMember(this);
 }
+

src/game/GroupReference.h

@@ -41,3 +41,4 @@ class TRINITY_DLL_SPEC GroupReference : public Reference<Group, Player>
         void setSubGroup(uint8 pSubGroup) { iSubGroup = pSubGroup; }
 };
 #endif
+

src/game/GuardAI.cpp

@@ -137,3 +137,4 @@ void GuardAI::JustDied(Unit *killer)
         i_creature.SendZoneUnderAttackMessage(pkiller);
 }
 
+

src/game/GuardAI.h

@@ -53,3 +53,4 @@ class TRINITY_DLL_DECL GuardAI : public CreatureAI
         TimeTracker i_tracker;
 };
 #endif
+

src/game/Guild.cpp

@@ -1985,3 +1985,4 @@ bool GuildItemPosCount::isContainedIn(GuildItemPosCountVec const &vec) const
 
     return false;
 }
+

src/game/Guild.h

@@ -454,3 +454,4 @@ class Guild
         Item* _StoreItem( uint8 tab, uint8 slot, Item *pItem, uint32 count, bool clone );
 };
 #endif
+