Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Spells/SpellInfo.h
	src/server/game/World/World.cpp
This commit is contained in:
Vincent_Michael
2013-12-15 03:47:21 +01:00
56 changed files with 455 additions and 117 deletions

View File

@@ -43,6 +43,9 @@ MapManager::MapManager()
{
i_gridCleanUpDelay = sWorld->getIntConfig(CONFIG_INTERVAL_GRIDCLEAN);
i_timer.SetInterval(sWorld->getIntConfig(CONFIG_INTERVAL_MAPUPDATE));
memset(i_GridStates, 0, sizeof(i_GridStates));
i_GridStateErrorCount = 0;
_nextInstanceId = 0;
}
MapManager::~MapManager() { }