mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-26 07:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9996] Remove grid state debugging code and move state machine to MapManager.

Browse source
This commit is contained in:
XTZGZoReX 2010-05-28 15:00:52 +02:00
parent 28c3de5093
commit aa62225c68
6 changed files with 42 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/game/MapManager.cpp
View file

@ -34,9 +34,8 @@
INSTANTIATE_SINGLETON_2(MapManager, CLASS_LOCK);
INSTANTIATE_CLASS_MUTEX(MapManager, ACE_Thread_Mutex);
extern GridState* si_GridStates[]; // debugging code, should be deleted some day
MapManager::MapManager() : i_gridCleanUpDelay(sWorld.getConfig(CONFIG_UINT32_INTERVAL_GRIDCLEAN))
MapManager::MapManager()
: i_gridCleanUpDelay(sWorld.getConfig(CONFIG_UINT32_INTERVAL_GRIDCLEAN))
{
i_timer.SetInterval(sWorld.getConfig(CONFIG_UINT32_INTERVAL_MAPUPDATE));
}
@ -49,59 +48,47 @@ MapManager::~MapManager()
for(TransportSet::iterator i = m_Transports.begin(); i != m_Transports.end(); ++i)
delete *i;
Map::DeleteStateMachine();
DeleteStateMachine();
}
void
MapManager::Initialize()
{
Map::InitStateMachine();
// debugging code, should be deleted some day
{
for(int i=0;i<MAX_GRID_STATE; i++)
{
i_GridStates[i] = si_GridStates[i];
}
i_GridStateErrorCount = 0;
}
InitStateMachine();
InitMaxInstanceId();
}
void MapManager::InitStateMachine()
{
si_GridStates[GRID_STATE_INVALID] = new InvalidState;
si_GridStates[GRID_STATE_ACTIVE] = new ActiveState;
si_GridStates[GRID_STATE_IDLE] = new IdleState;
si_GridStates[GRID_STATE_REMOVAL] = new RemovalState;
}
void MapManager::DeleteStateMachine()
{
delete si_GridStates[GRID_STATE_INVALID];
delete si_GridStates[GRID_STATE_ACTIVE];
delete si_GridStates[GRID_STATE_IDLE];
delete si_GridStates[GRID_STATE_REMOVAL];
}
void MapManager::UpdateGridState(grid_state_t state, Map& map, NGridType& ngrid, GridInfo& ginfo, const uint32 &x, const uint32 &y, const uint32 &t_diff)
{
// TODO: The grid state array itself is static and therefore 100% safe, however, the data
// the state classes in it accesses is not, since grids are shared across maps (for example
// in instances), so some sort of locking will be necessary later.
si_GridStates[state]->Update(map, ngrid, ginfo, x, y, t_diff);
}
void MapManager::InitializeVisibilityDistanceInfo()
{
for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
(*iter).second->InitVisibilityDistance();
}
// debugging code, should be deleted some day
void MapManager::checkAndCorrectGridStatesArray()
{
bool ok = true;
for(int i=0;i<MAX_GRID_STATE; i++)
{
if(i_GridStates[i] != si_GridStates[i])
{
sLog.outError("MapManager::checkGridStates(), GridState: si_GridStates is currupt !!!");
ok = false;
si_GridStates[i] = i_GridStates[i];
}
#ifdef MANGOS_DEBUG
// inner class checking only when compiled with debug
if(!si_GridStates[i]->checkMagic())
{
ok = false;
si_GridStates[i]->setMagic();
}
#endif
}
if(!ok)
++i_GridStateErrorCount;
if(i_GridStateErrorCount > 2)
ASSERT(false); // force a crash. Too many errors
}
Map*
MapManager::_createBaseMap(uint32 id)
{
@ -259,10 +246,7 @@ MapManager::Update(uint32 diff)
return;
for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
{
checkAndCorrectGridStatesArray(); // debugging code, should be deleted some day
iter->second->Update((uint32)i_timer.GetCurrent());
}
for (TransportSet::iterator iter = m_Transports.begin(); iter != m_Transports.end(); ++iter)
(*iter)->Update(i_timer.GetCurrent());