aboutsummaryrefslogtreecommitdiff
path: root/src/tools/vmap4_assembler/TileAssembler.h
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-07-05 13:09:00 +0200
committerOvahlord <dreadkiller@gmx.de>2024-07-06 15:35:54 +0200
commit5ed6b5e53acfac7b371a0e2d9f17fb4831e38403 (patch)
tree599a6ac69092d553d7ca388a191e481e7cfdfb2f /src/tools/vmap4_assembler/TileAssembler.h
parentb62b0e9317b82a039170e008e6c368a96d3d329c (diff)
Core/Vmaps: Minor cleanup in vmap4assembler - use unique_ptr to manage file handles
(cherry picked from commit c8a55f4a18052fa00e74a4fefdaf4a428252e1f9)
Diffstat (limited to 'src/tools/vmap4_assembler/TileAssembler.h')
-rw-r--r--src/tools/vmap4_assembler/TileAssembler.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/tools/vmap4_assembler/TileAssembler.h b/src/tools/vmap4_assembler/TileAssembler.h
index b2ec8fd73b5..5e9c963a0d7 100644
--- a/src/tools/vmap4_assembler/TileAssembler.h
+++ b/src/tools/vmap4_assembler/TileAssembler.h
@@ -72,11 +72,10 @@ namespace VMAP
uint32 liquidflags;
std::vector<MeshTriangle> triangles;
std::vector<G3D::Vector3> vertexArray;
- class WmoLiquid* liquid;
+ std::unique_ptr<WmoLiquid> liquid;
GroupModel_Raw() : mogpflags(0), GroupWMOID(0), liquidflags(0),
liquid(nullptr) { }
- ~GroupModel_Raw();
bool Read(FILE* f);
};
@@ -99,8 +98,7 @@ namespace VMAP
std::set<std::string> spawnedModelFiles;
public:
- TileAssembler(const std::string& pSrcDirName, const std::string& pDestDirName);
- virtual ~TileAssembler();
+ TileAssembler(std::string pSrcDirName, std::string pDestDirName);
bool convertWorld2();
bool readMapSpawns();