From cbf7a27478dfe3c63cbf7d1e40515cd85bb19675 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Tue, 6 Mar 2018 00:01:52 +0100 Subject: [PATCH] Revert "Core/MMaps: Fix crash introduced in commit 32e8b65 (#17447)" This reverts commit f293994. --- .../Collision/Management/MMapManager.cpp | 70 +++++++------------ src/common/Collision/Management/MMapManager.h | 3 - 2 files changed, 26 insertions(+), 47 deletions(-) diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp index e2d082474d6..5b55e2e09a3 100644 --- a/src/common/Collision/Management/MMapManager.cpp +++ b/src/common/Collision/Management/MMapManager.cpp @@ -191,7 +191,7 @@ namespace MMAP dtTileRef tileRef = 0; // memory allocated for data is now managed by detour, and will be deallocated when the tile is removed - if (dtStatusSucceed(mmap->navMesh->addTile(data, fileHeader.size, 0, 0, &tileRef))) + if (dtStatusSucceed(mmap->navMesh->addTile(data, fileHeader.size, DT_TILE_FREE_DATA, 0, &tileRef))) { mmap->loadedTileRefs.insert(std::pair(packedGridPos, tileRef)); ++loadedTiles; @@ -199,10 +199,7 @@ namespace MMAP PhaseChildMapContainer::const_iterator phasedMaps = phaseMapData.find(mapId); if (phasedMaps != phaseMapData.end()) - { - mmap->AddBaseTile(packedGridPos, data, fileHeader, fileHeader.size); LoadPhaseTiles(phasedMaps, x, y); - } return true; } @@ -295,7 +292,7 @@ namespace MMAP if (dataItr != phasedTileItr->second.end()) { TC_LOG_DEBUG("phase", "MMAP:UnloadPhaseTile: Unloaded phased %04u%02i%02i.mmtile for root phase map %u", phaseMapId, x, y, phasedMapData->first); - dtFree(dataItr->second->data); + delete dataItr->second->data; delete dataItr->second; phasedTileItr->second.erase(dataItr); } @@ -327,8 +324,7 @@ namespace MMAP dtTileRef tileRef = mmap->loadedTileRefs[packedGridPos]; // unload, and mark as non loaded - unsigned char* data = NULL; - if (dtStatusFailed(mmap->navMesh->removeTile(tileRef, &data, NULL))) + if (dtStatusFailed(mmap->navMesh->removeTile(tileRef, NULL, NULL))) { // this is technically a memory leak // if the grid is later reloaded, dtNavMesh::addTile will return error but no extra memory is used @@ -344,12 +340,7 @@ namespace MMAP PhaseChildMapContainer::const_iterator phasedMaps = phaseMapData.find(mapId); if (phasedMaps != phaseMapData.end()) - { - mmap->DeleteBaseTile(packedGridPos); UnloadPhaseTile(phasedMaps, x, y); - } - else - dtFree(data); return true; } @@ -372,19 +363,13 @@ namespace MMAP { uint32 x = (i->first >> 16); uint32 y = (i->first & 0x0000FFFF); - unsigned char* data = NULL; - if (dtStatusFailed(mmap->navMesh->removeTile(i->second, &data, NULL))) + if (dtStatusFailed(mmap->navMesh->removeTile(i->second, NULL, NULL))) TC_LOG_ERROR("maps", "MMAP:unloadMap: Could not unload %03u%02i%02i.mmtile from navmesh", mapId, x, y); else { PhaseChildMapContainer::const_iterator phasedMaps = phaseMapData.find(mapId); if (phasedMaps != phaseMapData.end()) - { - mmap->DeleteBaseTile(i->first); UnloadPhaseTile(phasedMaps, x, y); - } - else - dtFree(data); --loadedTiles; TC_LOG_DEBUG("maps", "MMAP:unloadMap: Unloaded mmtile %03i[%02i, %02i] from %03i", mapId, x, y, mapId); } @@ -471,6 +456,12 @@ namespace MMAP dtFreeNavMeshQuery(i->second); dtFreeNavMesh(navMesh); + + for (PhaseTileContainer::iterator i = _baseTiles.begin(); i != _baseTiles.end(); ++i) + { + delete (*i).second->data; + delete (*i).second; + } } void MMapData::RemoveSwap(PhasedTile* ptile, uint32 swap, uint32 packedXY) @@ -494,7 +485,9 @@ namespace MMAP // restore base tile if (dtStatusSucceed(navMesh->addTile(_baseTiles[packedXY]->data, _baseTiles[packedXY]->dataSize, 0, 0, &loadedTileRefs[packedXY]))) + { TC_LOG_DEBUG("phase", "MMapData::RemoveSwap: Loaded base mmtile %03u[%02i, %02i] into %03i[%02i, %02i]", _mapId, x, y, _mapId, header->x, header->y); + } else TC_LOG_ERROR("phase", "MMapData::RemoveSwap: Could not load base %03u%02i%02i.mmtile to navmesh", _mapId, x, y); } @@ -510,6 +503,7 @@ namespace MMAP void MMapData::AddSwap(PhasedTile* ptile, uint32 swap, uint32 packedXY) { + uint32 x = (packedXY >> 16); uint32 y = (packedXY & 0x0000FFFF); @@ -524,6 +518,7 @@ namespace MMAP return; } + dtMeshHeader* header = (dtMeshHeader*)ptile->data; const dtMeshTile* oldTile = navMesh->getTileByRef(loadedTileRefs[packedXY]); @@ -538,19 +533,30 @@ namespace MMAP header->x = oldTile->header->x; header->y = oldTile->header->y; + // the removed tile's data + PhasedTile* pt = new PhasedTile(); // remove old tile - if (dtStatusFailed(navMesh->removeTile(loadedTileRefs[packedXY], NULL, NULL))) + if (dtStatusFailed(navMesh->removeTile(loadedTileRefs[packedXY], &pt->data, &pt->dataSize))) + { TC_LOG_ERROR("phase", "MMapData::AddSwap: Could not unload %03u%02i%02i.mmtile from navmesh", _mapId, x, y); + delete pt; + } else { TC_LOG_DEBUG("phase", "MMapData::AddSwap: Unloaded %03u%02i%02i.mmtile from navmesh", _mapId, x, y); + // store the removed data first time, this is the origonal, non-phased tile + if (_baseTiles.find(packedXY) == _baseTiles.end()) + _baseTiles[packedXY] = pt; _activeSwaps.insert(swap); + loadedPhasedTiles[swap].insert(packedXY); // add new swapped tile if (dtStatusSucceed(navMesh->addTile(ptile->data, ptile->fileHeader.size, 0, 0, &loadedTileRefs[packedXY]))) + { TC_LOG_DEBUG("phase", "MMapData::AddSwap: Loaded phased mmtile %03u[%02i, %02i] into %03i[%02i, %02i]", swap, x, y, _mapId, header->x, header->y); + } else TC_LOG_ERROR("phase", "MMapData::AddSwap: Could not load %03u%02i%02i.mmtile to navmesh", swap, x, y); } @@ -583,28 +589,4 @@ namespace MMAP return navMesh; } - - void MMapData::AddBaseTile(uint32 packedGridPos, unsigned char* data, MmapTileHeader const& fileHeader, int32 dataSize) - { - auto itr = _baseTiles.find(packedGridPos); - if (itr == _baseTiles.end()) - { - PhasedTile* pt = new PhasedTile(); - pt->data = data; - pt->fileHeader = fileHeader; - pt->dataSize = dataSize; - _baseTiles[packedGridPos] = pt; - } - } - - void MMapData::DeleteBaseTile(uint32 packedGridPos) - { - auto itr = _baseTiles.find(packedGridPos); - if (itr != _baseTiles.end()) - { - dtFree(itr->second->data); - delete itr->second; - _baseTiles.erase(itr); - } - } } diff --git a/src/common/Collision/Management/MMapManager.h b/src/common/Collision/Management/MMapManager.h index 27133ed3e04..3fc5e8c4c41 100644 --- a/src/common/Collision/Management/MMapManager.h +++ b/src/common/Collision/Management/MMapManager.h @@ -69,9 +69,6 @@ namespace MMAP dtNavMesh* GetNavMesh(TerrainSet swaps); - void AddBaseTile(uint32 packedGridPos, unsigned char* data, MmapTileHeader const& fileHeader, int32 dataSize); - void DeleteBaseTile(uint32 packedGridPos); - // we have to use single dtNavMeshQuery for every instance, since those are not thread safe NavMeshQuerySet navMeshQueries; // instanceId to query