From a40e18367ad066f21a4bdcbc289a0d6a0bf35ae9 Mon Sep 17 00:00:00 2001 From: Matan Shukry Date: Mon, 29 Mar 2021 20:36:39 +0200 Subject: [PATCH] Core/Maps: Refactor duplicated code from all ***CellRelocation and CheckGridIntegrity into single templated function --- src/server/game/Maps/Map.cpp | 247 +++++++++-------------------------- src/server/game/Maps/Map.h | 6 +- 2 files changed, 70 insertions(+), 183 deletions(-) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index bc255741c1..f407ff36a5 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -1158,6 +1158,24 @@ void Map::RemoveFromMap(MapTransport* obj, bool remove) DeleteFromWorld(obj); } +template +/*static*/ bool Map::CheckGridIntegrity(T* object, bool moved, char const* objType) +{ + Cell const& cur_cell = object->GetCurrentCell(); + Cell xy_cell(object->GetPositionX(), object->GetPositionY()); + if (xy_cell != cur_cell) + { + TC_LOG_DEBUG("maps", "%s (%s) X: %f Y: %f (%s) is in grid[%u, %u]cell[%u, %u] instead of grid[%u, %u]cell[%u, %u]", + objType, object->GetGUID().ToString().c_str(), + object->GetPositionX(), object->GetPositionY(), (moved ? "final" : "original"), + cur_cell.GridX(), cur_cell.GridY(), cur_cell.CellX(), cur_cell.CellY(), + xy_cell.GridX(), xy_cell.GridY(), xy_cell.CellX(), xy_cell.CellY()); + return true; // not crash at error, just output error in debug mode + } + + return true; +} + void Map::PlayerRelocation(Player* player, float x, float y, float z, float orientation) { ASSERT(player); @@ -1187,20 +1205,20 @@ void Map::PlayerRelocation(Player* player, float x, float y, float z, float orie void Map::CreatureRelocation(Creature* creature, float x, float y, float z, float ang, bool respawnRelocationOnFail) { - ASSERT(CheckGridIntegrity(creature, false)); + ASSERT(CheckGridIntegrity(creature, false, "Creature")); - Cell old_cell = creature->GetCurrentCell(); Cell new_cell(x, y); if (!respawnRelocationOnFail && !getNGrid(new_cell.GridX(), new_cell.GridY())) return; + Cell old_cell = creature->GetCurrentCell(); // delay creature move for grid/cell to grid/cell moves if (old_cell.DiffCell(new_cell) || old_cell.DiffGrid(new_cell)) { - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "Creature (GUID: %u Entry: %u) added to moving list from grid[%u, %u]cell[%u, %u] to grid[%u, %u]cell[%u, %u].", creature->GetGUID().GetCounter(), creature->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); - #endif +#ifdef TRINITY_DEBUG + TC_LOG_DEBUG("maps", "Creature (%s Entry: %u) added to moving list from grid[%u, %u]cell[%u, %u] to grid[%u, %u]cell[%u, %u].", creature->GetGUID().ToString().c_str(), creature->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); +#endif AddCreatureToMoveList(creature, x, y, z, ang); // in diffcell/diffgrid case notifiers called at finishing move creature in Map::MoveAllCreaturesInMoveList } @@ -1214,20 +1232,18 @@ void Map::CreatureRelocation(Creature* creature, float x, float y, float z, floa RemoveCreatureFromMoveList(creature); } - ASSERT(CheckGridIntegrity(creature, true)); + ASSERT(CheckGridIntegrity(creature, true, "Creature")); } void Map::GameObjectRelocation(GameObject* go, float x, float y, float z, float orientation, bool respawnRelocationOnFail) { - Cell integrity_check(go->GetPositionX(), go->GetPositionY()); - Cell old_cell = go->GetCurrentCell(); - - ASSERT(integrity_check == old_cell); + ASSERT(CheckGridIntegrity(go, false, "GameObject")); Cell new_cell(x, y); if (!respawnRelocationOnFail && !getNGrid(new_cell.GridX(), new_cell.GridY())) return; + Cell old_cell = go->GetCurrentCell(); // delay creature move for grid/cell to grid/cell moves if (old_cell.DiffCell(new_cell) || old_cell.DiffGrid(new_cell)) { @@ -1245,23 +1261,17 @@ void Map::GameObjectRelocation(GameObject* go, float x, float y, float z, float go->UpdateObjectVisibility(false); RemoveGameObjectFromMoveList(go); } - - old_cell = go->GetCurrentCell(); - integrity_check = Cell(go->GetPositionX(), go->GetPositionY()); - ASSERT(integrity_check == old_cell); } void Map::DynamicObjectRelocation(DynamicObject* dynObj, float x, float y, float z, float orientation) { - Cell integrity_check(dynObj->GetPositionX(), dynObj->GetPositionY()); - Cell old_cell = dynObj->GetCurrentCell(); - - ASSERT(integrity_check == old_cell); + ASSERT(CheckGridIntegrity(dynObj, false, "DynamicObject")); Cell new_cell(x, y); if (!getNGrid(new_cell.GridX(), new_cell.GridY())) return; + Cell old_cell = dynObj->GetCurrentCell(); // delay creature move for grid/cell to grid/cell moves if (old_cell.DiffCell(new_cell) || old_cell.DiffGrid(new_cell)) { @@ -1279,9 +1289,7 @@ void Map::DynamicObjectRelocation(DynamicObject* dynObj, float x, float y, float RemoveDynamicObjectFromMoveList(dynObj); } - old_cell = dynObj->GetCurrentCell(); - integrity_check = Cell(dynObj->GetPositionX(), dynObj->GetPositionY()); - ASSERT(integrity_check == old_cell); + ASSERT(CheckGridIntegrity(dynObj, true, "DynamicObject")); } void Map::AddCreatureToMoveList(Creature* c, float x, float y, float z, float ang) @@ -1483,190 +1491,82 @@ void Map::MoveAllDynamicObjectsInMoveList() _dynamicObjectsToMoveLock = false; } -bool Map::CreatureCellRelocation(Creature* c, Cell new_cell) +template +bool Map::MapObjectCellRelocation(T* object, Cell new_cell, char const* objType) { - Cell const& old_cell = c->GetCurrentCell(); + Cell const& old_cell = object->GetCurrentCell(); if (!old_cell.DiffGrid(new_cell)) // in same grid { // if in same cell then none do if (old_cell.DiffCell(new_cell)) { - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "Creature (GUID: %u Entry: %u) moved in grid[%u, %u] from cell[%u, %u] to cell[%u, %u].", c->GetGUID().GetCounter(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.CellX(), new_cell.CellY()); - #endif +#ifdef TRINITY_DEBUG + TC_LOG_DEBUG("maps", "%s (%s Entry: %u) moved in grid[%u, %u] from cell[%u, %u] to cell[%u, %u].", objType, object->GetGUID().ToString().c_str(), object->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.CellX(), new_cell.CellY()); +#endif - c->RemoveFromGrid(); - AddToGrid(c, new_cell); + object->RemoveFromGrid(); + AddToGrid(object, new_cell); } else { - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "Creature (GUID: %u Entry: %u) moved in same grid[%u, %u]cell[%u, %u].", c->GetGUID().GetCounter(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY()); - #endif +#ifdef TRINITY_DEBUG + TC_LOG_DEBUG("maps", "%s (%s Entry: %u) moved in same grid[%u, %u]cell[%u, %u].", objType, object->GetGUID().ToString().c_str(), object->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY()); +#endif } return true; } // in diff. grids but active creature - if (c->isActiveObject()) + if (object->isActiveObject()) { - EnsureGridLoadedForActiveObject(new_cell, c); + EnsureGridLoadedForActiveObject(new_cell, object); - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "Active creature (GUID: %u Entry: %u) moved from grid[%u, %u]cell[%u, %u] to grid[%u, %u]cell[%u, %u].", c->GetGUID().GetCounter(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); - #endif +#ifdef TRINITY_DEBUG + TC_LOG_DEBUG("maps", "Active %s (%s Entry: %u) moved from grid[%u, %u]cell[%u, %u] to grid[%u, %u]cell[%u, %u].", objType, object->GetGUID().ToString().c_str(), object->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); +#endif - c->RemoveFromGrid(); - AddToGrid(c, new_cell); + object->RemoveFromGrid(); + AddToGrid(object, new_cell); return true; } - if (c->GetCharmerOrOwnerGUID().IsPlayer()) - EnsureGridLoaded(new_cell); - - // in diff. loaded grid normal creature + // in diff. loaded grid normal object if (IsGridLoaded(GridCoord(new_cell.GridX(), new_cell.GridY()))) { - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "Creature (GUID: %u Entry: %u) moved from grid[%u, %u]cell[%u, %u] to grid[%u, %u]cell[%u, %u].", c->GetGUID().GetCounter(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); - #endif +#ifdef TRINITY_DEBUG + TC_LOG_DEBUG("maps", "%s (%s Entry: %u) moved from grid[%u, %u]cell[%u, %u] to grid[%u, %u]cell[%u, %u].", objType, object->GetGUID().ToString().c_str(), object->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); +#endif - c->RemoveFromGrid(); + object->RemoveFromGrid(); EnsureGridCreated(GridCoord(new_cell.GridX(), new_cell.GridY())); - AddToGrid(c, new_cell); + AddToGrid(object, new_cell); return true; } - // fail to move: normal creature attempt move to unloaded grid - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "Creature (GUID: %u Entry: %u) attempted to move from grid[%u, %u]cell[%u, %u] to unloaded grid[%u, %u]cell[%u, %u].", c->GetGUID().GetCounter(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); - #endif + // fail to move: normal object attempt move to unloaded grid +#ifdef TRINITY_DEBUG + TC_LOG_DEBUG("maps", "%s (%s Entry: %u) attempted to move from grid[%u, %u]cell[%u, %u] to unloaded grid[%u, %u]cell[%u, %u].", objType, object->GetGUID().ToString().c_str(), object->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); +#endif + (void)objType; return false; } +bool Map::CreatureCellRelocation(Creature* c, Cell new_cell) +{ + return MapObjectCellRelocation(c, new_cell, "Creature"); +} + bool Map::GameObjectCellRelocation(GameObject* go, Cell new_cell) { - Cell const& old_cell = go->GetCurrentCell(); - if (!old_cell.DiffGrid(new_cell)) // in same grid - { - // if in same cell then none do - if (old_cell.DiffCell(new_cell)) - { - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "GameObject (GUID: %u Entry: %u) moved in grid[%u, %u] from cell[%u, %u] to cell[%u, %u].", go->GetGUID().GetCounter(), go->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.CellX(), new_cell.CellY()); - #endif - - go->RemoveFromGrid(); - AddToGrid(go, new_cell); - } - else - { - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "GameObject (GUID: %u Entry: %u) moved in same grid[%u, %u]cell[%u, %u].", go->GetGUID().GetCounter(), go->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY()); - #endif - } - - return true; - } - - // in diff. grids but active GameObject - if (go->isActiveObject()) - { - EnsureGridLoadedForActiveObject(new_cell, go); - - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "Active GameObject (GUID: %u Entry: %u) moved from grid[%u, %u]cell[%u, %u] to grid[%u, %u]cell[%u, %u].", go->GetGUID().GetCounter(), go->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); - #endif - - go->RemoveFromGrid(); - AddToGrid(go, new_cell); - - return true; - } - - // in diff. loaded grid normal GameObject - if (IsGridLoaded(GridCoord(new_cell.GridX(), new_cell.GridY()))) - { - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "GameObject (GUID: %u Entry: %u) moved from grid[%u, %u]cell[%u, %u] to grid[%u, %u]cell[%u, %u].", go->GetGUID().GetCounter(), go->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); - #endif - - go->RemoveFromGrid(); - EnsureGridCreated(GridCoord(new_cell.GridX(), new_cell.GridY())); - AddToGrid(go, new_cell); - - return true; - } - - // fail to move: normal GameObject attempt move to unloaded grid - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "GameObject (GUID: %u Entry: %u) attempted to move from grid[%u, %u]cell[%u, %u] to unloaded grid[%u, %u]cell[%u, %u].", go->GetGUID().GetCounter(), go->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); - #endif - return false; + return MapObjectCellRelocation(go, new_cell, "GameObject"); } bool Map::DynamicObjectCellRelocation(DynamicObject* go, Cell new_cell) { - Cell const& old_cell = go->GetCurrentCell(); - if (!old_cell.DiffGrid(new_cell)) // in same grid - { - // if in same cell then none do - if (old_cell.DiffCell(new_cell)) - { - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "DynamicObject (GUID: %u) moved in grid[%u, %u] from cell[%u, %u] to cell[%u, %u].", go->GetGUID().GetCounter(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.CellX(), new_cell.CellY()); - #endif - - go->RemoveFromGrid(); - AddToGrid(go, new_cell); - } - else - { - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "DynamicObject (GUID: %u) moved in same grid[%u, %u]cell[%u, %u].", go->GetGUID().GetCounter(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY()); - #endif - } - - return true; - } - - // in diff. grids but active GameObject - if (go->isActiveObject()) - { - EnsureGridLoadedForActiveObject(new_cell, go); - - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "Active DynamicObject (GUID: %u) moved from grid[%u, %u]cell[%u, %u] to grid[%u, %u]cell[%u, %u].", go->GetGUID().GetCounter(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); - #endif - - go->RemoveFromGrid(); - AddToGrid(go, new_cell); - - return true; - } - - // in diff. loaded grid normal GameObject - if (IsGridLoaded(GridCoord(new_cell.GridX(), new_cell.GridY()))) - { - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "DynamicObject (GUID: %u) moved from grid[%u, %u]cell[%u, %u] to grid[%u, %u]cell[%u, %u].", go->GetGUID().GetCounter(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); - #endif - - go->RemoveFromGrid(); - EnsureGridCreated(GridCoord(new_cell.GridX(), new_cell.GridY())); - AddToGrid(go, new_cell); - - return true; - } - - // fail to move: normal GameObject attempt move to unloaded grid - #ifdef TRINITY_DEBUG - TC_LOG_DEBUG("maps", "DynamicObject (GUID: %u) attempted to move from grid[%u, %u]cell[%u, %u] to unloaded grid[%u, %u]cell[%u, %u].", go->GetGUID().GetCounter(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY()); - #endif - return false; + return MapObjectCellRelocation(go, new_cell, "DynamicObject"); } bool Map::CreatureRespawnRelocation(Creature* c, bool diffGridOnly) @@ -2946,23 +2846,6 @@ bool Map::IsUnderWater(PhaseShift const& phaseShift, float x, float y, float z) return (GetLiquidStatus(phaseShift, x, y, z, MAP_LIQUID_TYPE_WATER | MAP_LIQUID_TYPE_OCEAN) & LIQUID_MAP_UNDER_WATER) != 0; } -bool Map::CheckGridIntegrity(Creature* c, bool moved) const -{ - Cell const& cur_cell = c->GetCurrentCell(); - Cell xy_cell(c->GetPositionX(), c->GetPositionY()); - if (xy_cell != cur_cell) - { - TC_LOG_DEBUG("maps", "Creature (GUID: %u) X: %f Y: %f (%s) is in grid[%u, %u]cell[%u, %u] instead of grid[%u, %u]cell[%u, %u]", - c->GetGUID().GetCounter(), - c->GetPositionX(), c->GetPositionY(), (moved ? "final" : "original"), - cur_cell.GridX(), cur_cell.GridY(), cur_cell.CellX(), cur_cell.CellY(), - xy_cell.GridX(), xy_cell.GridY(), xy_cell.CellX(), xy_cell.CellY()); - return true; // not crash at error, just output error in debug mode - } - - return true; -} - char const* Map::GetMapName() const { return i_mapEntry ? i_mapEntry->MapName : "UNNAMEDMAP\x0"; diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 05d3cc0e57..1880c26472 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -452,7 +452,8 @@ class TC_GAME_API Map : public GridRefManager bool GameObjectRespawnRelocation(GameObject* go, bool diffGridOnly); // assert print helper - bool CheckGridIntegrity(Creature* c, bool moved) const; + template + static bool CheckGridIntegrity(T* object, bool moved, char const* objType); uint32 GetInstanceId() const { return i_InstanceId; } uint8 GetSpawnMode() const { return (i_spawnMode); } @@ -693,6 +694,9 @@ class TC_GAME_API Map : public GridRefManager void SendInitSelf(Player* player); + template + bool MapObjectCellRelocation(T* object, Cell new_cell, char const* objType); + bool CreatureCellRelocation(Creature* creature, Cell new_cell); bool GameObjectCellRelocation(GameObject* go, Cell new_cell); bool DynamicObjectCellRelocation(DynamicObject* go, Cell new_cell);