josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix the crash caused by map::removing does not really resetmap

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-14 14:09:57 -05:00
parent ce21d65aa2
commit b3c9916177
1 changed files with 33 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Map.cpp
+33 -42
View File
@@ -733,37 +733,28 @@ void Map::Update(const uint32 &t_diff)
void Map::Remove(Player *player, bool remove) void Map::Remove(Player *player, bool remove)
{ {
player->RemoveFromWorld();
SendRemoveTransports(player);
CellPair p = Trinity::ComputeCellPair(player->GetPositionX(), player->GetPositionY()); CellPair p = Trinity::ComputeCellPair(player->GetPositionX(), player->GetPositionY());
if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP) if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP)
{
sLog.outCrash("Map::Remove: Player is in invalid cell!"); sLog.outCrash("Map::Remove: Player is in invalid cell!");
// invalid coordinates else
player->RemoveFromWorld();
if( remove )
DeleteFromWorld(player);
return;
}
Cell cell(p);
if( !getNGrid(cell.data.Part.grid_x, cell.data.Part.grid_y) )
{ {
sLog.outError("Map::Remove() i_grids was NULL x:%d, y:%d",cell.data.Part.grid_x,cell.data.Part.grid_y); Cell cell(p);
return; if( !getNGrid(cell.data.Part.grid_x, cell.data.Part.grid_y) )
sLog.outError("Map::Remove() i_grids was NULL x:%d, y:%d",cell.data.Part.grid_x,cell.data.Part.grid_y);
else
{
DEBUG_LOG("Remove player %s from grid[%u,%u]", player->GetName(), cell.GridX(), cell.GridY());
NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
assert(grid != NULL);
RemoveFromGrid(player,grid,cell);
UpdateObjectVisibility(player,cell,p);
}
} }
DEBUG_LOG("Remove player %s from grid[%u,%u]", player->GetName(), cell.GridX(), cell.GridY());
NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
assert(grid != NULL);
player->RemoveFromWorld();
RemoveFromGrid(player,grid,cell);
SendRemoveTransports(player);
UpdateObjectVisibility(player,cell,p);
if( remove ) if( remove )
DeleteFromWorld(player); DeleteFromWorld(player);
} }
@@ -785,29 +776,29 @@ template<class T>
void void
Map::Remove(T *obj, bool remove) Map::Remove(T *obj, bool remove)
{ {
CellPair p = Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP )
{
sLog.outError("Map::Remove: Object " I64FMT " have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUID(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord);
return;
}
Cell cell(p);
if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) )
return;
DEBUG_LOG("Remove object " I64FMT " from grid[%u,%u]", obj->GetGUID(), cell.data.Part.grid_x, cell.data.Part.grid_y);
NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
assert( grid != NULL );
obj->RemoveFromWorld(); obj->RemoveFromWorld();
if(obj->isActiveObject()) if(obj->isActiveObject())
RemoveFromActive(obj); RemoveFromActive(obj);
RemoveFromGrid(obj,grid,cell);
UpdateObjectVisibility(obj,cell,p); CellPair p = Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP )
sLog.outError("Map::Remove: Object " I64FMT " have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUID(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord);
else
{
Cell cell(p);
if(loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)))
{
DEBUG_LOG("Remove object " I64FMT " from grid[%u,%u]", obj->GetGUID(), cell.data.Part.grid_x, cell.data.Part.grid_y);
NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
assert( grid != NULL );
RemoveFromGrid(obj,grid,cell);
UpdateObjectVisibility(obj,cell,p);
}
}
obj->ResetMap(); obj->ResetMap();
if( remove ) if( remove )
{ {
// if option set then object already saved at this moment // if option set then object already saved at this moment