Rename BUILD_PLAYERBOT option to BUILD_DEPRECATED_PLAYERBOT

In preparation for new playerbot version Current player bot will still work as before, just use BUILD_DEPRECATED_PLAYERBOT=ON from now on. This may be removed in some future. master
cmangos · Mar 6, 2024 · c5e25dc · c5e25dc
1 parent 0a00e98
commit c5e25dc
Show file tree

Hide file tree

Showing 20 changed files with 74 additions and 73 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -324,13 +324,13 @@ if(NOT BUILD_GAME_SERVER AND BUILD_SCRIPTDEV)
   message(STATUS "BUILD_SCRIPTDEV forced to OFF due to BUILD_GAME_SERVER is not set")
 endif()
 
-if(NOT BUILD_GAME_SERVER AND BUILD_PLAYERBOT)
-  set(BUILD_PLAYERBOT OFF)
-  message(STATUS "BUILD_PLAYERBOT forced to OFF due to BUILD_GAME_SERVER is not set")
+if(NOT BUILD_GAME_SERVER AND BUILD_DEPRECATED_PLAYERBOT)
+  set(BUILD_DEPRECATED_PLAYERBOT OFF)
+  message(STATUS "BUILD_DEPRECATED_PLAYERBOT forced to OFF due to BUILD_GAME_SERVER is not set")
 endif()
 
 if(PCH)
-  if(${CMAKE_VERSION} VERSION_LESS "3.16") 
+  if(${CMAKE_VERSION} VERSION_LESS "3.16")
     message("PCH is not supported by your CMake version")
     message("Please consider to switch to CMake 3.16")
     message("PCH is forced to OFF")

diff --git a/cmake/options.cmake b/cmake/options.cmake
@@ -1,18 +1,18 @@
-option(DEBUG                "Include additional debug-code in core" OFF)
-option(WARNINGS             "Show all warnings during compile"      OFF)
-option(POSTGRESQL           "Use PostgreSQL"                        OFF)
-option(PCH                  "Use precompiled headers"               ON)
-option(BUILD_GAME_SERVER    "Build game server"                     ON)
-option(BUILD_LOGIN_SERVER   "Build login server"                    ON)
-option(BUILD_EXTRACTORS     "Build map/dbc/vmap/mmap extractors"    OFF)
-option(BUILD_SCRIPTDEV      "Build ScriptDev. (OFF Speedup build)"  ON)
-option(BUILD_PLAYERBOT      "Build Playerbot mod"                   OFF)
-option(BUILD_AHBOT          "Build Auction House Bot mod"           OFF)
-option(BUILD_METRICS        "Build Metrics, generate data for Grafana" OFF)
-option(BUILD_RECASTDEMOMOD  "Build map/vmap/mmap viewer"            OFF)
-option(BUILD_GIT_ID         "Build git_id"                          OFF)
-option(BUILD_DOCS           "Build documentation with doxygen"      OFF)
-option(CMAKE_INTERPROCEDURAL_OPTIMIZATION "Enable link-time optimizations" OFF)
+option(DEBUG                                "Include additional debug-code in core"     OFF)
+option(WARNINGS                             "Show all warnings during compile"          OFF)
+option(POSTGRESQL                           "Use PostgreSQL"                            OFF)
+option(PCH                                  "Use precompiled headers"                   ON)
+option(BUILD_GAME_SERVER                    "Build game server"                         ON)
+option(BUILD_LOGIN_SERVER                   "Build login server"                        ON)
+option(BUILD_EXTRACTORS                     "Build map/dbc/vmap/mmap extractors"        OFF)
+option(BUILD_SCRIPTDEV                      "Build ScriptDev. (OFF Speedup build)"      ON)
+option(BUILD_AHBOT                          "Build Auction House Bot mod"               OFF)
+option(BUILD_METRICS                        "Build Metrics, generate data for Grafana"  OFF)
+option(BUILD_RECASTDEMOMOD                  "Build map/vmap/mmap viewer"                OFF)
+option(BUILD_GIT_ID                         "Build git_id"                              OFF)
+option(BUILD_DOCS                           "Build documentation with doxygen"          OFF)
+option(CMAKE_INTERPROCEDURAL_OPTIMIZATION   "Enable link-time optimizations"            OFF)
+option(BUILD_DEPRECATED_PLAYERBOT           "Build previous version of Playerbot mod"   OFF)
 set(DEV_BINARY_DIR ${CMAKE_BINARY_DIR} CACHE STRING "Executable directory on Windows")
 
 # TODO: options that should be checked/created:
@@ -33,14 +33,15 @@ message(STATUS
     BUILD_GAME_SERVER       Build game server (core server)
     BUILD_LOGIN_SERVER      Build login server (auth server)
     BUILD_EXTRACTORS        Build map/dbc/vmap/mmap extractor
-    BUILD_SCRIPTDEV         Build scriptdev. (Disable it to speedup build in dev mode by not including scripts)
-    BUILD_PLAYERBOT         Build Playerbot mod
     BUILD_AHBOT             Build Auction House Bot mod
     BUILD_METRICS           Build Metrics, generate data for Grafana
     BUILD_RECASTDEMOMOD     Build map/vmap/mmap viewer
     BUILD_GIT_ID            Build git_id
     BUILD_DOCS              Build documentation with doxygen
     CMAKE_INTERPROCEDURAL_OPTIMIZATION Enable link-time optimizations
+    BUILD_DEPRECATED_PLAYERBOT         Build Playerbot mod (deprecated)
+    BUILD_SCRIPTDEV         Build scriptdev. (Disable it to speedup build
+                                in dev mode by not including scripts)
 
     DEV_BINARY_DIR          Target directory for executables on Windows only
 

diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake
@@ -61,10 +61,10 @@ else()
   message(STATUS "Build METRICs         : No  (default)")
 endif()
 
-if(BUILD_PLAYERBOT)
-  message(STATUS "Build Playerbot       : Yes")
+if(BUILD_DEPRECATED_PLAYERBOT)
+  message(STATUS "Build OLD Playerbot   : Yes")
 else()
-  message(STATUS "Build Playerbot       : No  (default)")
+  message(STATUS "Build OLD Playerbot   : No  (default)")
 endif()
 
 if(BUILD_EXTRACTORS)

diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
@@ -40,7 +40,7 @@ if(NOT BUILD_SCRIPTDEV)
   endforeach()
 endif()
 
-if(NOT BUILD_PLAYERBOT)
+if(NOT BUILD_DEPRECATED_PLAYERBOT)
   # exclude Playerbot folder
   set (EXCLUDE_DIR "PlayerBot/")
   foreach (TMP_PATH ${LIBRARY_SRCS})
@@ -122,9 +122,9 @@ if (BUILD_METRICS)
   add_definitions(-DBUILD_METRICS)
 endif()
 
-# Define BUILD_PLAYERBOT if need
-if (BUILD_PLAYERBOT)
-  add_definitions(-DBUILD_PLAYERBOT)
+# Define BUILD_DEPRECATED_PLAYERBOT if need
+if (BUILD_DEPRECATED_PLAYERBOT)
+  add_definitions(-DBUILD_DEPRECATED_PLAYERBOT)
 endif()
 
 if (MSVC)

diff --git a/src/game/Chat/Chat.cpp b/src/game/Chat/Chat.cpp
@@ -1039,7 +1039,7 @@ ChatCommand* ChatHandler::getCommandTable()
         { "mmap",           SEC_GAMEMASTER,     false, nullptr,                                        "", mmapCommandTable },
         { "worldstate",     SEC_ADMINISTRATOR,  false, nullptr,                                        "", worldStateTable },
         { "loot",           SEC_GAMEMASTER,     true,  nullptr,                                        "", lootCommandTable },
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
         { "bot",            SEC_PLAYER,         false, &ChatHandler::HandlePlayerbotCommand,           "", nullptr },
 #endif
         { nullptr,          0,                  false, nullptr,                                        "", nullptr }

diff --git a/src/game/Chat/Chat.h b/src/game/Chat/Chat.h
@@ -764,7 +764,7 @@ class ChatHandler
         bool HandleStableCommand(char* args);
         bool HandleWaterwalkCommand(char* args);
         bool HandleQuitCommand(char* args);
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
         bool HandlePlayerbotCommand(char* args);
 #endif
 

diff --git a/src/game/Chat/ChatHandler.cpp b/src/game/Chat/ChatHandler.cpp
@@ -39,7 +39,7 @@
 
 bool WorldSession::CheckChatMessage(std::string& msg, bool addon/* = false*/)
 {
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
     // bot check can be avoided
     if (_player->GetPlayerbotAI())
         return true;

diff --git a/src/game/Entities/CharacterHandler.cpp b/src/game/Entities/CharacterHandler.cpp
@@ -40,7 +40,7 @@
 #include "AI/ScriptDevAI/ScriptDevAIMgr.h"
 #include "Anticheat/Anticheat.hpp"
 
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
 #include "PlayerBot/Base/PlayerbotMgr.h"
 #endif
 
@@ -131,7 +131,7 @@ class CharacterHandler
             if (WorldSession* session = sWorld.FindSession(((LoginQueryHolder*)holder)->GetAccountId()))
                 session->HandlePlayerLogin((LoginQueryHolder*)holder);
         }
-#ifdef BUILD_PLAYERBOT
+#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
         // world session m_playerBots map
@@ -547,7 +547,7 @@ void WorldSession::HandlePlayerLoginOpcode(WorldPacket& recv_data)
     CharacterDatabase.DelayQueryHolder(&chrHandler, &CharacterHandler::HandlePlayerLoginCallback, holder);
 }
 
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
 // Can't easily reuse HandlePlayerLoginOpcode for logging in bots because it assumes
 // a WorldSession exists for the bot. The WorldSession for a bot is created after the character is loaded.
 void PlayerbotMgr::LoginPlayerBot(ObjectGuid playerGuid)

diff --git a/src/game/Entities/Creature.h b/src/game/Entities/Creature.h
@@ -580,7 +580,7 @@ class Creature : public Unit
         bool IsTemporarySummon() const { return m_subtype == CREATURE_SUBTYPE_TEMPORARY_SUMMON; }
         bool IsCritter() const { return m_creatureInfo->CreatureType == CREATURE_TYPE_CRITTER; }
 
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
         // Adds functionality to load/unload bots from NPC, also need to apply SQL scripts
         void LoadBotMenu(Player* pPlayer);
 #endif

diff --git a/src/game/Entities/Player.cpp b/src/game/Entities/Player.cpp
@@ -65,7 +65,7 @@
 #include "World/WorldState.h"
 #include "Anticheat/Anticheat.hpp"
 
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
 #include "PlayerBot/Base/PlayerbotAI.h"
 #include "PlayerBot/Base/PlayerbotMgr.h"
 #include "Config/Config.h"
@@ -87,7 +87,7 @@
 #define SKILL_PERM_BONUS(x)    int16(PAIR32_HIPART(x))
 #define MAKE_SKILL_BONUS(t, p) MAKE_PAIR32(t,p)
 
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
 extern Config botConfig;
 #endif
 
@@ -477,7 +477,7 @@ void TradeData::SetAccepted(bool state, bool crosssend /*= false*/)
 
 Player::Player(WorldSession* session): Unit(), m_taxiTracker(*this), m_mover(this), m_camera(this), m_reputationMgr(this), m_launched(false)
 {
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
     m_playerbotAI = 0;
     m_playerbotMgr = 0;
 #endif
@@ -689,7 +689,7 @@ Player::~Player()
         for (BoundInstancesMap::iterator itr = m_boundInstance.begin(); itr != m_boundInstance.end(); ++itr)
             itr->second.state->RemovePlayer(this);
 
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
     if (m_playerbotAI)
     {
         delete m_playerbotAI;
@@ -1620,7 +1620,7 @@ void Player::Update(const uint32 diff)
     if (IsHasDelayedTeleport() && !m_semaphoreTeleport_Near)
         TeleportTo(m_teleport_dest, m_teleport_options);
 
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
     if (m_playerbotAI)
         m_playerbotAI->UpdateAI(diff);
     else if (m_playerbotMgr)
@@ -1931,7 +1931,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
 
     MapEntry const* mEntry = sMapStore.LookupEntry(mapid);  // Validity checked in IsValidMapCoord
 
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
     // If this user has bots, tell them to stop following master
     // so they don't try to follow the master after the master teleports
     if (GetPlayerbotMgr())
@@ -12255,7 +12255,7 @@ void Player::PrepareGossipMenu(WorldObject* pSource, uint32 menuId, bool forceQu
                     break;                                  // no checks
                 case GOSSIP_OPTION_BOT:
                 {
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
                     if (botConfig.GetBoolDefault("PlayerbotAI.DisableBots", false) && !pCreature->isInnkeeper())
                     {
                         ChatHandler(this).PSendSysMessage("|cffff0000Playerbot system is currently disabled!");
@@ -12533,7 +12533,7 @@ void Player::OnGossipSelect(WorldObject* pSource, uint32 gossipListId, uint32 me
         case GOSSIP_OPTION_AUCTIONEER:
             GetSession()->SendAuctionHello(((Creature*)pSource));
             break;
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
         case GOSSIP_OPTION_BOT:
         {
             // DEBUG_LOG("GOSSIP_OPTION_BOT");

diff --git a/src/game/Entities/Player.h b/src/game/Entities/Player.h
@@ -59,7 +59,7 @@ class Spell;
 class Item;
 struct FactionTemplateEntry;
 
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
 #include "PlayerBot/Base/PlayerbotMgr.h"
 #include "PlayerBot/Base/PlayerbotAI.h"
 #endif
@@ -1413,7 +1413,7 @@ class Player : public Unit
         void AddTimedQuest(uint32 quest_id) { m_timedquests.insert(quest_id); }
         void RemoveTimedQuest(uint32 quest_id) { m_timedquests.erase(quest_id); }
 
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
         void chompAndTrim(std::string& str);
         bool getNextQuestId(const std::string& pString, unsigned int& pStartPos, unsigned int& pId);
         void skill(std::list<uint32>& m_spellsToLearn);
@@ -2253,7 +2253,7 @@ class Player : public Unit
 
         void SendMessageToPlayer(std::string const& message) const; // debugging purposes
 
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
         // A Player can either have a playerbotMgr (to manage its bots), or have playerbotAI (if it is a bot), or
         // neither. Code that enables bots must create the playerbotMgr and set it using SetPlayerbotMgr.
         void SetPlayerbotAI(PlayerbotAI* ai) { assert(!m_playerbotAI && !m_playerbotMgr); m_playerbotAI = ai; }
@@ -2576,7 +2576,7 @@ class Player : public Unit
         MapReference m_mapRef;
         std::unique_ptr<PlayerMenu> m_playerMenu;
 
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
         PlayerbotAI* m_playerbotAI;
         PlayerbotMgr* m_playerbotMgr;
 #endif

diff --git a/src/game/Groups/Group.cpp b/src/game/Groups/Group.cpp
@@ -32,7 +32,7 @@
 #include "Maps/MapManager.h"
 #include "Maps/MapPersistentStateMgr.h"
 #include "Spells/SpellAuras.h"
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
 #include "PlayerBot/Base/PlayerbotMgr.h"
 #endif
 
@@ -379,7 +379,7 @@ bool Group::AddMember(ObjectGuid guid, const char* name)
 uint32 Group::RemoveMember(ObjectGuid guid, uint8 method)
 {
     Player* player = sObjectMgr.GetPlayer(guid);
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
     // if master leaves group, all bots leave group
     if (player && player->GetPlayerbotMgr())
         player->GetPlayerbotMgr()->RemoveAllBotsFromGroup();

diff --git a/src/game/Quests/QuestHandler.cpp b/src/game/Quests/QuestHandler.cpp
@@ -31,7 +31,7 @@
 #include "Groups/Group.h"
 #include "Tools/Formulas.h"
 
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
 #include "PlayerBot/Base/PlayerbotAI.h"
 #endif
 
@@ -595,12 +595,12 @@ void WorldSession::HandlePushQuestToParty(WorldPacket& recvPacket)
                     continue;
                 }
 
-#ifndef BUILD_PLAYERBOT
+#ifndef BUILD_DEPRECATED_PLAYERBOT
                 pPlayer->GetPlayerMenu()->SendQuestGiverQuestDetails(pQuest, _player->GetObjectGuid(), true);
 #endif
                 pPlayer->SetDividerGuid(_player->GetObjectGuid());
 
-#ifdef BUILD_PLAYERBOT
+#ifdef BUILD_DEPRECATED_PLAYERBOT
                 if (pPlayer->GetPlayerbotAI())
                     pPlayer->GetPlayerbotAI()->AcceptQuest(pQuest, _player);
                 else