diff options
Diffstat (limited to 'modules')
4 files changed, 14 insertions, 7 deletions
diff --git a/modules/acore/extractors/map_extractor/adt.h b/modules/acore/extractors/map_extractor/adt.h index d56e6731f2..71e83cd999 100644 --- a/modules/acore/extractors/map_extractor/adt.h +++ b/modules/acore/extractors/map_extractor/adt.h @@ -53,8 +53,8 @@ class adt_MCLQ uint32 fcc; char fcc_txt[4]; }; - uint32 size; public: + uint32 size; float height1; float height2; struct liquid_data{ @@ -82,8 +82,8 @@ class adt_MCNK uint32 fcc; char fcc_txt[4]; }; - uint32 size; public: + uint32 size; uint32 flags; uint32 ix; uint32 iy; @@ -141,8 +141,8 @@ class adt_MCIN uint32 fcc; char fcc_txt[4]; }; - uint32 size; public: + uint32 size; struct adt_CELLS{ uint32 offsMCNK; uint32 size; @@ -257,6 +257,7 @@ class adt_MHDR uint32 fcc; char fcc_txt[4]; }; +public: uint32 size; uint32 pad; diff --git a/modules/worldengine/lib-collision/src/Management/MMapFactory.cpp b/modules/worldengine/lib-collision/src/Management/MMapFactory.cpp index b8573f7f89..798fecaadb 100644 --- a/modules/worldengine/lib-collision/src/Management/MMapFactory.cpp +++ b/modules/worldengine/lib-collision/src/Management/MMapFactory.cpp @@ -23,7 +23,7 @@ namespace MMAP return g_MMapManager; } - bool MMapFactory::IsPathfindingEnabled(const Map* map, bool force) + bool MMapFactory::IsPathfindingEnabled(const Map* map) { if (!map) return false; return !forbiddenMaps[map->GetId()] && (sWorld->getBoolConfig(CONFIG_ENABLE_MMAPS) ? true : map->IsBattlegroundOrArena()); diff --git a/modules/worldengine/lib-collision/src/Management/MMapFactory.h b/modules/worldengine/lib-collision/src/Management/MMapFactory.h index 2020d74e8e..84799f8118 100644 --- a/modules/worldengine/lib-collision/src/Management/MMapFactory.h +++ b/modules/worldengine/lib-collision/src/Management/MMapFactory.h @@ -31,7 +31,7 @@ namespace MMAP public: static MMapManager* createOrGetMMapManager(); static void clear(); - static bool IsPathfindingEnabled(const Map* map, bool force = false); + static bool IsPathfindingEnabled(const Map* map); static void InitializeDisabledMaps(); static bool forbiddenMaps[1000]; }; diff --git a/modules/worldengine/nucleus/src/Threading/Threading.cpp b/modules/worldengine/nucleus/src/Threading/Threading.cpp index eac2178ec8..e62d92dea8 100644 --- a/modules/worldengine/nucleus/src/Threading/Threading.cpp +++ b/modules/worldengine/nucleus/src/Threading/Threading.cpp @@ -79,12 +79,15 @@ std::thread::id Thread::currentId() void Thread::setPriority(Priority priority) { +#ifdef WIN32 std::thread::native_handle_type handle = m_ThreadImp.native_handle(); +#endif + bool _ok = true; -#ifdef WIN32 switch (priority) { +#ifdef WIN32 case Priority_Realtime: _ok = SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); break; case Priority_Highest: _ok = SetThreadPriority(handle, THREAD_PRIORITY_HIGHEST); break; case Priority_High: _ok = SetThreadPriority(handle, THREAD_PRIORITY_ABOVE_NORMAL); break; @@ -92,8 +95,11 @@ void Thread::setPriority(Priority priority) case Priority_Low: _ok = SetThreadPriority(handle, THREAD_PRIORITY_BELOW_NORMAL); break; case Priority_Lowest: _ok = SetThreadPriority(handle, THREAD_PRIORITY_LOWEST); break; case Priority_Idle: _ok = SetThreadPriority(handle, THREAD_PRIORITY_IDLE); break; - } #endif + default: + break; + } + // remove this ASSERT in case you don't want to know is thread priority change was successful or not ASSERT(_ok); |