diff --git a/server/gameserver/navmeshbuilder.cc b/server/gameserver/navmeshbuilder.cc index df9d241..1d69eab 100644 --- a/server/gameserver/navmeshbuilder.cc +++ b/server/gameserver/navmeshbuilder.cc @@ -68,9 +68,8 @@ void NavMeshBuilder::InitBuilderParams(BuilderParams& builder_params) } } -void NavMeshBuilder::InitTileCacheParams(BuilderParams& builder_params) +void NavMeshBuilder::InitTileCacheParams(BuilderParams& builder_params, dtTileCacheParams& tcparams) { - dtTileCacheParams& tcparams = builder_params.tcparams; // Tile cache params. memset(&tcparams, 0, sizeof(tcparams)); rcVcopy(tcparams.orig, builder_params.gemo->GetMeshBoundsMin()); @@ -322,10 +321,11 @@ int NavMeshBuilder::RasterizeTileLayers(const int tx, const int ty, bool NavMeshBuilder::CreateTileCache(BuilderParams& builder_params) { - InitTileCacheParams(builder_params); + dtTileCacheParams tcparams; + InitTileCacheParams(builder_params, tcparams); builder_params.tile_cache = dtAllocTileCache(); dtStatus status = builder_params.tile_cache->init - (&builder_params.tcparams, + (&tcparams, builder_params.talloc, builder_params.tcomp, builder_params.tmproc); diff --git a/server/gameserver/navmeshbuilder.h b/server/gameserver/navmeshbuilder.h index c2a5270..0a46790 100644 --- a/server/gameserver/navmeshbuilder.h +++ b/server/gameserver/navmeshbuilder.h @@ -21,7 +21,7 @@ public: private: void InitBuilderParams(BuilderParams& builder_params); - void InitTileCacheParams(BuilderParams& builder_params); + void InitTileCacheParams(BuilderParams& builder_params, dtTileCacheParams& tcparams); void InitNavMeshParams(BuilderParams& builder_params, dtNavMeshParams& params); void BuildTiles(BuilderParams& builder_params); int RasterizeTileLayers(const int tx, const int ty, diff --git a/server/gameserver/navmeshhelper.h b/server/gameserver/navmeshhelper.h index 72765d8..802a845 100644 --- a/server/gameserver/navmeshhelper.h +++ b/server/gameserver/navmeshhelper.h @@ -293,7 +293,6 @@ struct BuilderParams InputGeom* gemo = nullptr; rcConfig cfg; - dtTileCacheParams tcparams; MapInstance* map_instance = nullptr; LinearAllocator* talloc = nullptr; FastLZCompressor* tcomp = nullptr;