sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/core_merge_10_2025

Browse Source 
# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Server/WorldSession.h
#	src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
This commit is contained in:
bash
2025-10-19 22:34:18 +02:00
parent 2eda59a0dc 21d2e99d7f
commit 1aac4fbef6
448 changed files with 22792 additions and 5924 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Collision/Management/MMapMgr.cpp
-3
View File
@@ -23,9 +23,6 @@
namespace MMAP
{
static char const* const MAP_FILE_NAME_FORMAT = "{}/mmaps/{:03}.mmap";
static char const* const TILE_FILE_NAME_FORMAT = "{}/mmaps/{:03}{:02}{:02}.mmtile";
// ######################## MMapMgr ########################
MMapMgr::~MMapMgr()
{
src/common/Collision/Management/MMapMgr.h
+3
View File
@@ -39,6 +39,9 @@ inline void dtCustomFree(void* ptr)
// move map related classes
namespace MMAP
{
static char const* const MAP_FILE_NAME_FORMAT = "{}/mmaps/{:03}.mmap";
static char const* const TILE_FILE_NAME_FORMAT = "{}/mmaps/{:03}{:02}{:02}.mmtile";
typedef std::unordered_map<uint32, dtTileRef> MMapTileSet;
typedef std::unordered_map<uint32, dtNavMeshQuery*> NavMeshQuerySet;