-Internal: bg vanilla build fixes.

cmangos · Oct 9, 2024 · cac788f · cac788f
1 parent 9179d48
commit cac788f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/playerbot/RandomPlayerbotMgr.cpp b/playerbot/RandomPlayerbotMgr.cpp
@@ -1139,10 +1139,12 @@ void RandomPlayerbotMgr::CheckBgQueue()
             uint32 TeamId = player->GetTeam() == ALLIANCE ? 0 : 1;
 
             BattleGroundTypeId bgTypeId = sServerFacade.BgTemplateId(queueTypeId);
-#ifdef MANGOS
+#ifdef MANGOSBOT_ZERO
             BattleGroundBracketId bracketId = player->GetBattleGroundBracketIdFromLevel(bgTypeId);
 #endif
-#ifdef CMANGOS
+#ifdef MANGOSBOT_ONE
+            BattleGroundBracketId bracketId = sBattleGroundMgr.GetBattleGroundBracketIdFromLevel(bgTypeId, player->GetLevel());
+#endif
 #ifdef MANGOSBOT_TWO
             BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
             uint32 mapId = bg->GetMapId();
@@ -1151,9 +1153,6 @@ void RandomPlayerbotMgr::CheckBgQueue()
                 continue;
 
             BattleGroundBracketId bracketId = pvpDiff->GetBracketId();
-#else
-            BattleGroundBracketId bracketId = sBattleGroundMgr.GetBattleGroundBracketIdFromLevel(bgTypeId, player->GetLevel());
-#endif
 #endif
 #ifdef MANGOSBOT_TWO
             if (ArenaType arenaType = sServerFacade.BgArenaType(queueTypeId))
@@ -1279,6 +1278,13 @@ void RandomPlayerbotMgr::CheckBgQueue()
             uint32 TeamId = bot->GetTeam() == ALLIANCE ? 0 : 1;
 
             BattleGroundTypeId bgTypeId = sServerFacade.BgTemplateId(queueTypeId);
+
+#ifdef MANGOSBOT_ZERO
+            BattleGroundBracketId bracketId = bot->GetBattleGroundBracketIdFromLevel(bgTypeId);
+#endif
+#ifdef MANGOSBOT_ONE
+            BattleGroundBracketId bracketId = sBattleGroundMgr.GetBattleGroundBracketIdFromLevel(bgTypeId, bot->GetLevel());;
+#endif
 #ifdef MANGOSBOT_TWO
             BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
             uint32 mapId = bg->GetMapId();
@@ -1287,11 +1293,8 @@ void RandomPlayerbotMgr::CheckBgQueue()
                 continue;
 
             BattleGroundBracketId bracketId = pvpDiff->GetBracketId();
-#else
-            BattleGroundBracketId bracketId = sBattleGroundMgr.GetBattleGroundBracketIdFromLevel(bgTypeId, bot->GetLevel());;
 #endif
-
-#ifdef MANGOSBOT_TWO
+            #ifdef MANGOSBOT_TWO
             ArenaType arenaType = sServerFacade.BgArenaType(queueTypeId);
             if (arenaType != ARENA_TYPE_NONE)
             {

diff --git a/playerbot/strategy/actions/BattleGroundJoinAction.cpp b/playerbot/strategy/actions/BattleGroundJoinAction.cpp
@@ -337,24 +337,24 @@ bool BGJoinAction::canJoinBg(Player* player, BattleGroundQueueTypeId queueTypeId
 
     // check bracket
 #ifdef MANGOSBOT_ZERO
-        if (bracketId != bot->GetBattleGroundBracketIdFromLevel(bgTypeId);
-            return false;
+    if (bracketId != bot->GetBattleGroundBracketIdFromLevel(bgTypeId))
+        return false;
 #endif
 #ifdef MANGOSBOT_ONE
     if (sBattleGroundMgr.GetBattleGroundBracketIdFromLevel(bgTypeId, bot->GetLevel()) != bracketId)
         return false;
 #endif
 #ifdef MANGOSBOT_TWO
-        BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
-        uint32 mapId = bg->GetMapId();
-        PvPDifficultyEntry const* pvpDiff = GetBattlegroundBracketByLevel(mapId, player->GetLevel());
-        if (!pvpDiff)
-            return false;
+    BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
+    uint32 mapId = bg->GetMapId();
+    PvPDifficultyEntry const* pvpDiff = GetBattlegroundBracketByLevel(mapId, player->GetLevel());
+    if (!pvpDiff)
+        return false;
 
-        BattleGroundBracketId bracket_temp = pvpDiff->GetBracketId();
+    BattleGroundBracketId bracket_temp = pvpDiff->GetBracketId();
 
-        if (bracket_temp != bracketId)
-            return false;
+    if (bracket_temp != bracketId)
+        return false;
 #endif
     return true;
 }
@@ -666,10 +666,10 @@ bool BGJoinAction::JoinQueue(uint32 type)
 
     bracketId = pvpDiff->GetBracketId();
 #endif
-#ifdef MANGOSBOS_ZERO
+#ifdef MANGOSBOT_ZERO
     bracketId = bot->GetBattleGroundBracketIdFromLevel(bgTypeId);
 #endif
-#ifdef MANGOSBOS_ONE
+#ifdef MANGOSBOT_ONE
     bracketId = sBattleGroundMgr.GetBattleGroundBracketIdFromLevel(bgTypeId, bot->GetLevel());
 #endif