aboutsummaryrefslogtreecommitdiff
path: root/src/common/Collision/Maps/MapTree.h
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-07-05 17:48:08 +0200
committerOvahlord <dreadkiller@gmx.de>2024-07-06 15:36:06 +0200
commit5acd3085501fb7ad4ad76ccec4f727e20869cacd (patch)
treed0da6c8d5d6efedb98741d73646ce469ea594552 /src/common/Collision/Maps/MapTree.h
parentf82fcdc1769307f8b82cebefdcf2030cea1b9e7d (diff)
Core/Vmaps: Minor cleanup in MapTree - use unique_ptr to manage file handles
(cherry picked from commit 5dbb6b043f8e66a3b163e4275dc8ec8ce22ce096)
Diffstat (limited to 'src/common/Collision/Maps/MapTree.h')
-rw-r--r--src/common/Collision/Maps/MapTree.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/common/Collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h
index 5260d7d602e..b39eb62f1bd 100644
--- a/src/common/Collision/Maps/MapTree.h
+++ b/src/common/Collision/Maps/MapTree.h
@@ -65,19 +65,10 @@ namespace VMAP
loadedSpawnMap iLoadedSpawns;
std::string iBasePath;
- struct TileFileOpenResult
- {
- std::string Name;
- FILE* File;
- int32 UsedMapId;
- };
-
private:
- static TileFileOpenResult OpenMapTileFile(std::string const& basePath, uint32 mapID, uint32 tileX, uint32 tileY, VMapManager2* vm);
bool getIntersectionTime(const G3D::Ray& pRay, float &pMaxDist, bool pStopAtFirstHit, ModelIgnoreFlags ignoreFlags) const;
//bool containsLoadedMapTile(unsigned int pTileIdent) const { return(iLoadedMapTiles.containsKey(pTileIdent)); }
public:
- static std::string getTileFileName(uint32 mapID, uint32 tileX, uint32 tileY);
static uint32 packTileID(uint32 tileX, uint32 tileY) { return tileX<<16 | tileY; }
static void unpackTileID(uint32 ID, uint32 &tileX, uint32 &tileY) { tileX = ID >> 16; tileY = ID & 0xFF; }
static LoadResult CanLoadMap(const std::string &basePath, uint32 mapID, uint32 tileX, uint32 tileY, VMapManager2* vm);