Fix more upstream merge conflicts

araxiaonline/cmake_setup.sh

@@ -9,6 +9,7 @@ cmake .. \
     -DSERVERS=1 \
     -DSCRIPTS=static \
     -DWITH_WARNINGS=1 \
+    -DBUILD_EFSW=1 \
     -DCMAKE_C_COMPILER_LAUNCHER=ccache \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 

dep/efsw/CMakeLists.txt

@@ -1,10 +1,3 @@
-# araxia changes that we are commenting out for now.
-#if (NOT BUILD_SHARED_LIBS)
-#  set(EFSW_CPP_SOURCE
-#    src/efsw/Atomic.hpp
-#    src/efsw/base.hpp
-
-
 add_library(efsw STATIC)
 
 if(WIN32)

src/araxiaonline/mcp/MCPPlayerManager.cpp

@@ -377,11 +377,12 @@ WorldSession* MCPPlayerManager::CreateBotSession(uint32 sessionId, uint32 accoun
         accountId,                          // Account ID
         std::string("MCPBot"),              // Account name
         0,                                  // Battlenet account ID
+        std::string(""),                    // Battlenet account email
         nullptr,                            // Socket = NULL (no network!)
         SEC_GAMEMASTER,                     // Security level - GM for full access
-        EXPANSION_THE_WAR_WITHIN,               // Expansion
+        EXPANSION_THE_WAR_WITHIN,           // Expansion
         0,                                  // Mute time
-        "Bot",                              // OS string
+        std::string("Bot"),                 // OS string
         Minutes(0),                         // Timezone offset
         0,                                  // Client build
         {},                                 // Build variant

src/araxiaonline/mcp/ServerTools.cpp

@@ -874,7 +874,7 @@ void RegisterServerTools()
                     if (!itemTemplate) continue;
                     
                     // Quality filter - check bucket's quality mask
-                    if (qualityFilter >= 0 && itemTemplate->GetQuality() < qualityFilter)
+                    if (qualityFilter >= 0 && itemTemplate->GetQuality() < static_cast<uint32>(qualityFilter))
                         continue;
                     
                     // Name filter using bucket's FullName (same as server's BuildListBuckets)

src/araxiaonline/mcp/WorldScan.cpp

@@ -15,7 +15,7 @@
 #include "GameObject.h"
 #include "Log.h"
 #include "VMapFactory.h"
-#include "VMapManager2.h"
+#include "VMapManager.h"
 #include "VMapDefinitions.h"
 #include "DatabaseEnv.h"
 #include "StringFormat.h"
@@ -55,7 +55,7 @@ RayCastResult CastRay(Map* map, float startX, float startY, float startZ,
     
     // Use VMAP for line of sight check
     // Note: isInLineOfSight returns true if CAN see (no obstacle)
-    VMAP::VMapManager2* vmgr = VMAP::VMapFactory::createOrGetVMapManager();
+    VMAP::VMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager();
     if (vmgr)
     {
         // Binary search to find collision distance

src/server/scripts/Commands/cs_reload.cpp

@@ -50,7 +50,6 @@ EndScriptData */
 #include "SpellMgr.h"
 #include "SupportMgr.h"
 #include "VehicleDefines.h"
-#include "WardenCheckMgr.h"
 #include "WaypointManager.h"
 #include "World.h"