diff --git a/playerbot/strategy/actions/BattleGroundTactics.cpp b/playerbot/strategy/actions/BattleGroundTactics.cpp index 898835ee..5a65aac6 100644 --- 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 index c50f982f..3ca4d2da 100644 --- 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 const& vPaths, std::vector const& vFlagIds); - //bool CheckFlagAv(); + bool CheckFlagAv(); bool flagTaken(); bool teamFlagTaken(); bool protectFC();