Replace submodule with fetchcontent (#97)

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "src/modules/Bots"]
-	path = src/modules/Bots
-	url = https://github.com/celguar/mangosbot-bots.git

CMakeLists.txt

@@ -380,19 +380,16 @@ if(BUILD_PLAYERBOTS)
   endif()
 endif()
 
-if(NOT BUILD_GAME_SERVER AND BUILD_IKE3_BOTS)
-  set(BUILD_IKE3_BOTS OFF)
-  message(STATUS "BUILD_PLAYERBOTS forced to OFF due to BUILD_GAME_SERVER is not set")
-endif()
-
-if(BUILD_IKE3_BOTS)
-  set(BUILD_PLAYERBOT OFF)
-  message(STATUS "CMaNGOS bots DISABLED because Ike3 bots enabled")
-endif()
+if(BUILD_PLAYERBOTS)
+  if(BUILD_DEPRECATED_PLAYERBOT)
+    set(BUILD_DEPRECATED_PLAYERBOT OFF)
+    message(STATUS "BUILD_DEPRECATED_PLAYERBOT forced to OFF because BUILD_PLAYERBOTS is set")
+  endif()
 
-if(BUILD_PLAYERBOT)
-  set(BUILD_IKE3_BOTS OFF)
-  message(STATUS "Ike3 bots DISABLED because CMaNGOS bots enabled")
+  if(NOT BUILD_GAME_SERVER)
+    set(BUILD_PLAYERBOTS OFF)
+    message(STATUS "BUILD_PLAYERBOTS forced to OFF due to BUILD_GAME_SERVER is not set")
+  endif()
 endif()
 
 if(BUILD_MODULES AND NOT BUILD_GAME_SERVER)

cmake/options.cmake

@@ -10,7 +10,7 @@ option(BUILD_PLAYERBOTS                     "Build Playerbots mod"
 option(BUILD_AHBOT                          "Build Auction House Bot mod"               OFF)
 
 # Modules
-option(BUILD_MODULES        "Build module system"                   OFF)
+option(BUILD_MODULES                        "Build module system"                       OFF)
 foreach(MODULE_NAME ${MODULE_NAMES})
   if(NOT ${MODULE_NAME} STREQUAL "MODULES")
     string(TOLOWER ${MODULE_NAME} LOWER_MODULE_NAME)

cmake/showoptions.cmake

@@ -73,12 +73,6 @@ else()
   message(STATUS "Build Playerbots      : No  (default)")
 endif()
 
-if(BUILD_IKE3_BOTS)
-  message(STATUS "Build ike3 Playerbots : Yes")
-else()
-  message(STATUS "Build ike3 Playerbots : No  (default)")
-endif()
-
 # Modules
 if(BUILD_MODULES)
   message(STATUS "Build Modules         : Yes")

src/game/CMakeLists.txt

@@ -53,7 +53,7 @@ endif()
 
 if(NOT BUILD_PLAYERBOTS)
   # exclude Playerbots folder
-  set (EXCLUDE_DIR "Bots/")
+  set (EXCLUDE_DIR "PlayerBots/")
   foreach (TMP_PATH ${LIBRARY_SRCS})
       string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
       if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
@@ -184,8 +184,8 @@ if (BUILD_PLAYERBOTS)
   add_definitions(-DENABLE_PLAYERBOTS)
 endif()
 
-# Define Ike3 Bots ENABLE_PLAYERBOTS if need
-if (BUILD_IKE3_BOTS)
+# Define ENABLE_PLAYERBOTS if need
+if (BUILD_PLAYERBOTS)
   add_definitions(-DENABLE_PLAYERBOTS)
 endif()
 

src/game/Entities/CharacterHandler.cpp

@@ -256,7 +256,6 @@ class CharacterHandler
                 session->HandlePlayerLogin((LoginQueryHolder*)holder);
 #endif
         }
-
 #ifdef BUILD_DEPRECATED_PLAYERBOT
         // This callback is different from the normal HandlePlayerLoginCallback in that it
         // sets up the bot's world session and also stores the pointer to the bot player in the master's

src/game/Server/WorldSession.h

@@ -243,7 +243,6 @@ class WorldSession
         const std::string GetRemoteAddress() const { return m_socket ? m_socket->GetRemoteAddress() : "disconnected/bot"; }
 #else
         const std::string GetRemoteAddress() const { return m_socket ? m_socket->GetRemoteAddress() : "disconnected"; }
-#endif
 #endif
         const std::string& GetLocalAddress() const { return m_localAddress; }
 

src/mangosd/CMakeLists.txt

@@ -89,11 +89,15 @@ if(WIN32)
   add_custom_command(TARGET ${EXECUTABLE_NAME} POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/src/game/Anticheat/module/warden_modules/ $<TARGET_FILE_DIR:${EXECUTABLE_NAME}>/warden_modules
     DEPENDS ${EXECUTABLE_NAME})
-
   if(BUILD_DEPRECATED_PLAYERBOT)
     add_custom_command(TARGET ${EXECUTABLE_NAME} POST_BUILD
 	  COMMAND ${CMAKE_COMMAND} -E copy_if_different \"${CMAKE_SOURCE_DIR}/src/game/PlayerBot/playerbot.conf.dist.in\" \"$<TARGET_FILE_DIR:${EXECUTABLE_NAME}>/playerbot.conf.dist\")
   endif()
+
+    if(BUILD_PLAYERBOTS)
+    add_custom_command(TARGET ${EXECUTABLE_NAME} POST_BUILD
+	  COMMAND ${CMAKE_COMMAND} -E copy_if_different \"${CMAKE_SOURCE_DIR}/src/modules/playerbots/playerbot/aiplayerbot.conf.dist.in\" \"$<TARGET_FILE_DIR:${EXECUTABLE_NAME}>/aiplayerbot.conf.dist\")
+  endif()
 
   if(BUILD_PLAYERBOTS)
     add_custom_command(TARGET ${EXECUTABLE_NAME} POST_BUILD