Skip to content

Commit

Permalink
[12130] Fix a bg achievement due to a missing change of [12067]
Browse files Browse the repository at this point in the history
Note: This is what override correctness is used for :)

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
  • Loading branch information
DomGries authored and Schmoozerd committed Aug 29, 2012
1 parent 8d2e90c commit 4b5116f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/game/AchievementMgr.cpp
Expand Up @@ -922,7 +922,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
case 156: // AB, win while controlling all 5 flags (all nodes)
case 784: // EY, win while holding 4 bases (all nodes)
{
if (!bg->IsAllNodesConrolledByTeam(GetPlayer()->GetTeam()))
if (!bg->IsAllNodesControlledByTeam(GetPlayer()->GetTeam()))
continue;
break;
}
Expand Down
2 changes: 1 addition & 1 deletion src/game/BattleGround/BattleGround.h
Expand Up @@ -290,7 +290,7 @@ class BattleGround
virtual void StartingEventOpenDoors() {}

/* achievement req. */
virtual bool IsAllNodesConrolledByTeam(Team /*team*/) const { return false; }
virtual bool IsAllNodesControlledByTeam(Team /*team*/) const { return false; }
bool IsTeamScoreInRange(Team team, uint32 minScore, uint32 maxScore) const;

/* Battleground */
Expand Down
2 changes: 1 addition & 1 deletion src/game/BattleGround/BattleGroundAB.h
Expand Up @@ -202,7 +202,7 @@ class BattleGroundAB : public BattleGround
virtual void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;

/* achievement req. */
bool IsAllNodesControlledByTeam(Team team) const; // overwrited
bool IsAllNodesControlledByTeam(Team team) const override;
bool IsTeamScores500Disadvantage(Team team) const { return m_TeamScores500Disadvantage[GetTeamIndexByTeamId(team)]; }
private:
/* Gameobject spawning/despawning */
Expand Down
2 changes: 1 addition & 1 deletion src/game/BattleGround/BattleGroundEY.h
Expand Up @@ -283,7 +283,7 @@ class BattleGroundEY : public BattleGround
virtual void EventPlayerDroppedFlag(Player* source) override;

/* achievement req. */
bool IsAllNodesControlledByTeam(Team team) const;
bool IsAllNodesControlledByTeam(Team team) const override;

private:
void EventPlayerCapturedFlag(Player* source, BG_EY_Nodes node); // NOTE: virtual BattleGround::EventPlayerCapturedFlag has different parameters list
Expand Down
2 changes: 1 addition & 1 deletion src/shared/revision_nr.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "12129"
#define REVISION_NR "12130"
#endif // __REVISION_NR_H__

0 comments on commit 4b5116f

Please sign in to comment.