Improvements and changes for Playerbots mergeÃ

cmangos · Mar 4, 2024 · 7e77a0d · 7e77a0d
1 parent 222f4c5
commit 7e77a0d
Show file tree

Hide file tree

Showing 119 changed files with 174 additions and 333 deletions.
diff --git a/contrib/mmap/CMakeLists.txt b/contrib/mmap/CMakeLists.txt
@@ -117,11 +117,6 @@ if (BUILD_EXTRACTORS)
     add_custom_command(TARGET ${EXECUTABLE_NAME} POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FILES_LIST_TO_COPY} \"$<TARGET_FILE_DIR:${EXECUTABLE_NAME}>\")
   endif()
-
-  # Define ENABLE_PLAYERBOTS if need
-  if (BUILD_PLAYERBOTS)
-    add_definitions(-DENABLE_PLAYERBOTS)
-  endif()
 
   install(TARGETS ${EXECUTABLE_NAME} DESTINATION ${BIN_DIR}/tools)
   install(PROGRAMS "${CMAKE_SOURCE_DIR}/contrib/extractor_scripts/MoveMapGen.sh" DESTINATION ${BIN_DIR}/tools)

diff --git a/contrib/mmap/src/MapBuilder.cpp b/contrib/mmap/src/MapBuilder.cpp
@@ -31,7 +31,6 @@
 
 using namespace VMAP;
 
-#ifdef ENABLE_MANGOSBOTS
 void rcModAlmostUnwalkableTriangles(rcContext* ctx, const float walkableSlopeAngle,
     const float* verts, int /*nv*/,
     const int* tris, int nt,
@@ -61,7 +60,6 @@ void rcModAlmostUnwalkableTriangles(rcContext* ctx, const float walkableSlopeAng
         }
     }
 }
-#endif
 
 void from_json(const json& j, rcConfig& config)
 {
@@ -1029,9 +1027,10 @@ namespace MMAP
         unsigned char* triFlags = new unsigned char[tTriCount];
         memset(triFlags, NAV_AREA_GROUND, tTriCount * sizeof(unsigned char));
         rcClearUnwalkableTriangles(m_rcContext, tileCfg.walkableSlopeAngle, tVerts, tVertCount, tTris, tTriCount, triFlags);
-#ifdef ENABLE_MANGOSBOTS
+
+        // mark almost unwalkable triangles with steep flag
         rcModAlmostUnwalkableTriangles(m_rcContext, 50.0f, tVerts, tVertCount, tTris, tTriCount, triFlags);
-#endif
+
         rcRasterizeTriangles(m_rcContext, tVerts, tVertCount, tTris, triFlags, tTriCount, *tile.solid, tileCfg.walkableClimb);
         delete[] triFlags;
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -21,41 +21,43 @@ if(BUILD_GAME_SERVER OR BUILD_LOGIN_SERVER OR BUILD_EXTRACTORS)
   add_subdirectory(shared)
 endif()
 
-if(BUILD_GAME_SERVER)
-  add_subdirectory(game)
-  add_subdirectory(mangosd)
-endif()
-
-if(BUILD_LOGIN_SERVER)
-  add_subdirectory(realmd)
-endif()
-
 # Playerbots module
 if(BUILD_PLAYERBOTS)
   include(FetchContent)
 
   FetchContent_Declare(
-    playerbots
+    PlayerBots
+    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/modules/PlayerBots"
     GIT_REPOSITORY "https://github.com/cmangos/playerbots.git"
-	GIT_TAG "master"
+    GIT_TAG "master"
   )
 
-  if(NOT playerbots_POPULATED)
-	message(STATUS "Fetching Playerbots module...")
-
-    FetchContent_Populate(playerbots)
-
-	if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/modules/Bots)
-      file(REMOVE_RECURSE ${CMAKE_CURRENT_SOURCE_DIR}/modules/Bots)
-    endif()
-
-	file(COPY ${playerbots_SOURCE_DIR}/. DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/modules/Bots)
-    message(STATUS "Playerbots module fetched and populated in ${CMAKE_CURRENT_SOURCE_DIR}/modules/Bots")
+  FetchContent_GetProperties(PlayerBots)
+  if (NOT playerbots_POPULATED)
+    FetchContent_Populate(PlayerBots)
+    message(STATUS "Playerbots module source dir: ${playerbots_SOURCE_DIR}")
+  else()
+    message(STATUS "Playerbots module already populated: ${playerbots_POPULATED}")
   endif()
 
-  add_subdirectory(modules/Bots)
+  #target_include_directories(Bots PUBLIC ${playerbots_SOURCE_DIR})
+  message(STATUS "Playerbots module source dir: ${playerbots_SOURCE_DIR}")
+  message(STATUS "Playerbots module binary dir: ${playerbots_BINARY_DIR}")
+  message(STATUS "Playerbots module populated: ${playerbots_POPULATED}")
+
+  add_subdirectory(${playerbots_SOURCE_DIR})
+
 else()
-  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/modules/Bots)
-    file(REMOVE_RECURSE ${CMAKE_CURRENT_SOURCE_DIR}/modules/Bots)
-  endif()
+  # if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/modules/PlayerBots)
+  #   file(REMOVE_RECURSE ${CMAKE_CURRENT_SOURCE_DIR}/modules/PlayerBots)
+  # endif()
+endif()
+
+if(BUILD_GAME_SERVER)
+  add_subdirectory(game)
+  add_subdirectory(mangosd)
+endif()
+
+if(BUILD_LOGIN_SERVER)
+  add_subdirectory(realmd)
 endif()
diff --git a/src/game/AI/CreatureAISelector.cpp b/src/game/AI/CreatureAISelector.cpp
@@ -25,7 +25,7 @@
 #include "AI/ScriptDevAI/ScriptDevAIMgr.h"
 #include "Entities/Pet.h"
 #include "Entities/Player.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "BaseAI/PetAI.h"
 #include "BaseAI/PossessedAI.h"
 #include "AI/PlayerAI/PlayerAI.h"

diff --git a/src/game/AI/ScriptDevAI/base/TimerAI.cpp b/src/game/AI/ScriptDevAI/base/TimerAI.cpp
@@ -16,7 +16,7 @@
 
 #include "TimerAI.h"
 #include "Chat/Chat.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include <string>
 
 Timer::Timer(uint32 id, std::function<void()> functor, uint32 timerMin, uint32 timerMax, TimerCombat combatSetting, bool disabled)

diff --git a/src/game/Addons/AddonHandler.cpp b/src/game/Addons/AddonHandler.cpp
@@ -21,7 +21,7 @@
 #include "Addons/AddonHandler.h"
 #include "Database/DatabaseEnv.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Policies/Singleton.h"
 
 INSTANTIATE_SINGLETON_1(AddonHandler);

diff --git a/src/game/Anticheat/module/AddonHandler.cpp b/src/game/Anticheat/module/AddonHandler.cpp
@@ -8,7 +8,7 @@
 #include "libanticheat.hpp"
 #include "config.hpp"
 #include "Server/WorldPacket.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 #include "Util/Util.h"
 #include "Database/DatabaseEnv.h"

diff --git a/src/game/Anticheat/module/Antispam/antispammgr.cpp b/src/game/Anticheat/module/Antispam/antispammgr.cpp
@@ -11,7 +11,7 @@
 #include "Server/WorldSession.h"
 #include "World/World.h"
 #include "Accounts/AccountMgr.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 #include "Database/DatabaseEnv.h"
 #include "Policies/Singleton.h"

diff --git a/src/game/Anticheat/module/Movement/movement.cpp b/src/game/Anticheat/module/Movement/movement.cpp
@@ -22,7 +22,7 @@
 #include "World/World.h"
 #include "Tools/Language.h"
 #include "Movement/MoveSpline.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 namespace
 {

diff --git a/src/game/Anticheat/module/Warden/warden.cpp b/src/game/Anticheat/module/Warden/warden.cpp
@@ -14,7 +14,7 @@
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "World/World.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/Opcodes.h"
 #include "Util/ByteBuffer.h"
 #include "Database/DatabaseEnv.h"

diff --git a/src/game/Anticheat/module/Warden/wardenmac.cpp b/src/game/Anticheat/module/Warden/wardenmac.cpp
@@ -13,7 +13,7 @@
 #include "Auth/CryptoHash.h"
 #include "World/World.h"
 #include "../config.hpp"
-#include "Log.h"
+#include "Log/Log.h"
 
 #include <memory>
 #include <vector>

diff --git a/src/game/Anticheat/module/Warden/wardenmodulemgr.cpp b/src/game/Anticheat/module/Warden/wardenmodulemgr.cpp
@@ -12,7 +12,7 @@
 #include "Platform/Define.h"
 #include "Policies/Singleton.h"
 #include "Util/Util.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 #include <vector>
 #include <string>

diff --git a/src/game/Anticheat/module/Warden/wardenwin.cpp b/src/game/Anticheat/module/Warden/wardenwin.cpp
@@ -23,7 +23,7 @@
 #include "Util/ByteBuffer.h"
 #include "Database/DatabaseEnv.h"
 #include "Entities/Player.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 #include <string>
 #include <vector>

diff --git a/src/game/Anticheat/module/libanticheat.cpp b/src/game/Anticheat/module/libanticheat.cpp
@@ -21,7 +21,7 @@
 #include "Chat/Chat.h"
 #include "Tools/Language.h"
 #include "Globals/ObjectMgr.h"
-#include "Log.h"
+#include "Log/Log.h"
 
 #include "Antispam/antispammgr.hpp"
 #include "Antispam/antispam.hpp"

diff --git a/src/game/AuctionHouse/AuctionHouseHandler.cpp b/src/game/AuctionHouse/AuctionHouseHandler.cpp
@@ -19,7 +19,7 @@
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "World/World.h"
 #include "Globals/ObjectMgr.h"
 #include "Entities/ObjectGuid.h"

diff --git a/src/game/AuctionHouse/AuctionHouseMgr.cpp b/src/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -25,7 +25,7 @@
 #include "Accounts/AccountMgr.h"
 #include "Entities/Item.h"
 #include "Tools/Language.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Globals/ObjectMgr.h"
 #include "Entities/ObjectGuid.h"
 #include "Entities/Player.h"

diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
@@ -18,7 +18,7 @@
 
 #include "AuctionHouseBot.h"
 #include "Globals/ObjectMgr.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Policies/Singleton.h"
 #include "Util/ProgressBar.h"
 #include "SystemConfig.h"

diff --git a/src/game/BattleGround/BattleGround.cpp b/src/game/BattleGround/BattleGround.cpp
@@ -1465,7 +1465,6 @@ uint32 BattleGround::GetSingleCreatureGuid(uint8 event1, uint8 event2)
     return ObjectGuid();
 }
 
-#ifdef ENABLE_PLAYERBOTS
 /**
   Function returns a gameobject guid from event map
 
@@ -1482,7 +1481,6 @@ uint32 BattleGround::GetSingleGameObjectGuid(uint8 event1, uint8 event2)
 
     return ObjectGuid();
 }
-#endif
 
 /**
   Method that handles gameobject load from DB event map

diff --git a/src/game/BattleGround/BattleGround.h b/src/game/BattleGround/BattleGround.h
@@ -507,10 +507,8 @@ class BattleGround
         // Get creature guid from event
         uint32 GetSingleCreatureGuid(uint8 /*event1*/, uint8 /*event2*/);
 
-#ifdef ENABLE_PLAYERBOTS
         // Get gameobject guid from event
         uint32 GetSingleGameObjectGuid(uint8 /*event1*/, uint8 /*event2*/);
-#endif
 
         // Handle door events
         void OpenDoorEvent(uint8 /*event1*/, uint8 event2 = 0);

diff --git a/src/game/BattleGround/BattleGroundHandler.cpp b/src/game/BattleGround/BattleGroundHandler.cpp
@@ -19,7 +19,7 @@
 #include "Common.h"
 #include "Server/WorldPacket.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Entities/Player.h"
 #include "Globals/ObjectMgr.h"
 #include "Server/WorldSession.h"

diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
@@ -124,66 +124,9 @@ target_include_directories(${LIBRARY_NAME}
 )
 
 if(BUILD_PLAYERBOTS)
-    include_directories(
-        ${CMAKE_SOURCE_DIR}/src/game
-        ${CMAKE_SOURCE_DIR}/src/game/AI
-        ${CMAKE_SOURCE_DIR}/src/game/Accounts
-        ${CMAKE_SOURCE_DIR}/src/game/Addons
-        ${CMAKE_SOURCE_DIR}/src/game/Arena
-        ${CMAKE_SOURCE_DIR}/src/game/AuctionHouse
-        ${CMAKE_SOURCE_DIR}/src/game/BattleGround
-        ${CMAKE_SOURCE_DIR}/src/game/Chat
-        ${CMAKE_SOURCE_DIR}/src/game/ChatCommands
-        ${CMAKE_SOURCE_DIR}/src/game/Combat
-        ${CMAKE_SOURCE_DIR}/src/game/DBScripts
-        ${CMAKE_SOURCE_DIR}/src/game/Entities
-        ${CMAKE_SOURCE_DIR}/src/game/GMTickets
-        ${CMAKE_SOURCE_DIR}/src/game/GameEvents
-        ${CMAKE_SOURCE_DIR}/src/game/Globals
-        ${CMAKE_SOURCE_DIR}/src/game/Grids
-        ${CMAKE_SOURCE_DIR}/src/game/Groups
-        ${CMAKE_SOURCE_DIR}/src/game/Guilds
-        ${CMAKE_SOURCE_DIR}/src/game/LFG
-        ${CMAKE_SOURCE_DIR}/src/game/Loot
-        ${CMAKE_SOURCE_DIR}/src/game/Mails
-        ${CMAKE_SOURCE_DIR}/src/game/Maps
-        ${CMAKE_SOURCE_DIR}/src/game/MotionGenerators
-        ${CMAKE_SOURCE_DIR}/src/game/Movement
-        ${CMAKE_SOURCE_DIR}/src/game/Object
-        ${CMAKE_SOURCE_DIR}/src/game/OutdoorPvP
-        ${CMAKE_SOURCE_DIR}/src/game/Pools
-        ${CMAKE_SOURCE_DIR}/src/game/Quests
-        ${CMAKE_SOURCE_DIR}/src/game/References
-        ${CMAKE_SOURCE_DIR}/src/game/Reputation
-        ${CMAKE_SOURCE_DIR}/src/game/Server
-        ${CMAKE_SOURCE_DIR}/src/game/Server
-        ${CMAKE_SOURCE_DIR}/src/game/Skills
-        ${CMAKE_SOURCE_DIR}/src/game/Social
-        ${CMAKE_SOURCE_DIR}/src/game/Spells
-        ${CMAKE_SOURCE_DIR}/src/game/Tools
-        ${CMAKE_SOURCE_DIR}/src/game/Trade
-        ${CMAKE_SOURCE_DIR}/src/game/VoiceChat
-        ${CMAKE_SOURCE_DIR}/src/game/Warden
-        ${CMAKE_SOURCE_DIR}/src/game/Weather
-        ${CMAKE_SOURCE_DIR}/src/game/World
-        ${CMAKE_SOURCE_DIR}/src/game/WorldHandlers
-        ${CMAKE_SOURCE_DIR}/src/game/movement
-        ${CMAKE_SOURCE_DIR}/src/game/vmap
-        ${CMAKE_SOURCE_DIR}/src/shared
-        ${CMAKE_SOURCE_DIR}/src/shared/Auth
-        ${CMAKE_SOURCE_DIR}/src/shared/Config
-        ${CMAKE_SOURCE_DIR}/src/shared/Common
-        ${CMAKE_SOURCE_DIR}/src/shared/Database
-        ${CMAKE_SOURCE_DIR}/src/shared/DataStores
-        ${CMAKE_SOURCE_DIR}/src/shared/Utilities
-        ${CMAKE_SOURCE_DIR}/src/shared/Log
-        ${CMAKE_SOURCE_DIR}/src/shared/Threading
-        ${CMAKE_SOURCE_DIR}/src/modules/Bots/playerbot
-        ${CMAKE_SOURCE_DIR}/src/modules/Bots/ahbot
-    )
-
-	target_link_libraries(${LIBRARY_NAME} PUBLIC Bots)
-    add_dependencies(${LIBRARY_NAME} Bots)
+  target_link_libraries(${LIBRARY_NAME} PUBLIC playerbots)
+  target_include_directories(${LIBRARY_NAME} PUBLIC ${CMAKE_SOURCE_DIR}/src/modules/PlayerBots)
+  add_dependencies(${LIBRARY_NAME} playerbots)
 endif()
 
 if(UNIX)

diff --git a/src/game/Chat/Chat.cpp b/src/game/Chat/Chat.cpp
@@ -22,7 +22,7 @@
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "Server/Opcodes.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "World/World.h"
 #include "Globals/ObjectMgr.h"
 #include "Globals/ObjectAccessor.h"
@@ -36,9 +36,9 @@
 #include "GameEvents/GameEventMgr.h"
 
 #ifdef ENABLE_PLAYERBOTS
-#include "AhBot.h"
-#include "playerbot.h"
-#include "PlayerbotAIConfig.h"
+#include "ahbot/AhBot.h"
+#include "playerbot/playerbot.h"
+#include "playerbot/PlayerbotAIConfig.h"
 #endif
 
 #include <cstdarg>

diff --git a/src/game/Chat/Chat.h b/src/game/Chat/Chat.h
@@ -101,9 +101,7 @@ class ChatHandler
 
         bool HasSentErrorMessage() const { return sentErrorMessage;}
 
-#ifdef ENABLE_PLAYERBOTS
         WorldSession* GetSession() { return m_session; }
-#endif
 
         /**
         * \brief Prepare SMSG_GM_MESSAGECHAT/SMSG_MESSAGECHAT

diff --git a/src/game/Chat/ChatHandler.cpp b/src/game/Chat/ChatHandler.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "Common.h"
-#include "Log.h"
+#include "Log/Log.h"
 #include "Server/WorldPacket.h"
 #include "Server/WorldSession.h"
 #include "World/World.h"
@@ -38,8 +38,8 @@
 #include "Anticheat/Anticheat.hpp"
 
 #ifdef ENABLE_PLAYERBOTS
-#include "playerbot.h"
-#include "RandomPlayerbotMgr.h"
+#include "playerbot/playerbot.h"
+#include "playerbot/RandomPlayerbotMgr.h"
 #endif
 
 bool WorldSession::CheckChatMessage(std::string& msg, bool addon/* = false*/)