Revert "Bg: Removed some wip methods" (#139)

This reverts commit f45a754. Co-authored-by: mostlikely4r <[email protected]>
cmangos · Feb 2, 2025 · 7d7b9c3 · 7d7b9c3
1 parent 58d0790
commit 7d7b9c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/playerbot/strategy/actions/BattleGroundTactics.cpp b/playerbot/strategy/actions/BattleGroundTactics.cpp
@@ -2836,7 +2836,7 @@ bool BGTactics::Execute(Event& event)
     {
         switch (bgType)
         {
-            //case BATTLEGROUND_AV: return CheckFlagAv();
+            case BATTLEGROUND_AV: return CheckFlagAv();
         }
 
         if (vFlagIds)
@@ -2973,8 +2973,6 @@ bool BGTactics::selectObjective(bool reset)
     if (pos.isSet() && !reset)
         return false;
 
-    WorldObject* BgObjective = nullptr;
-
     BattleGroundTypeId bgType = bg->GetTypeId();
 #ifdef MANGOSBOT_TWO
     if (bgType == BATTLEGROUND_RB)
@@ -2990,8 +2988,8 @@ bool BGTactics::selectObjective(bool reset)
 
         switch (bot->GetTeam())
         {
-            //case ALLIANCE: hasObjective = SelectAvObjectiveAlliance(objectiveLocation); break;
-            //case HORDE: hasObjective = SelectAvObjectiveHorde(objectiveLocation); break;
+            case ALLIANCE: hasObjective = SelectAvObjectiveAlliance(objectiveLocation); break;
+            case HORDE: hasObjective = SelectAvObjectiveHorde(objectiveLocation); break;
         }
 
         if (hasObjective)

diff --git a/playerbot/strategy/actions/BattleGroundTactics.h b/playerbot/strategy/actions/BattleGroundTactics.h
@@ -45,8 +45,8 @@ class BGTactics : public MovementAction
     BGTactics(PlayerbotAI* ai, std::string name = "bg tactics") : MovementAction(ai, name) {}
     virtual bool Execute(Event& event);
 private:
-    //bool SelectAvObjectiveAlliance(WorldLocation& objectiveLocation);
-    //bool SelectAvObjectiveHorde(WorldLocation& objectiveLocation);
+    bool SelectAvObjectiveAlliance(WorldLocation& objectiveLocation);
+    bool SelectAvObjectiveHorde(WorldLocation& objectiveLocation);
     bool moveToStart(bool force = false);
     bool selectObjective(bool reset = false);
     bool moveToObjective();
@@ -59,7 +59,7 @@ class BGTactics : public MovementAction
     bool wsgRoofJump();
     bool eotsJump();
     bool atFlag(std::vector<BattleBotPath*> const& vPaths, std::vector<uint32> const& vFlagIds);
-    //bool CheckFlagAv();
+    bool CheckFlagAv();
     bool flagTaken();
     bool teamFlagTaken();
     bool protectFC();