From caa36a0219bac7b9ab71aa0681ab5b13e940c8aa Mon Sep 17 00:00:00 2001 From: stfx Date: Tue, 28 Aug 2012 23:24:14 +0200 Subject: [PATCH] [12147] Fix a bg achievement due to a missing change of [12067] Note: This is what override correctness is used for :) Signed-off-by: Schmoozerd --- src/game/AchievementMgr.cpp | 2 +- src/game/BattleGround/BattleGround.h | 2 +- src/game/BattleGround/BattleGroundAB.h | 2 +- src/game/BattleGround/BattleGroundEY.h | 2 +- src/shared/revision_nr.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index e31c192c3..efcda3b29 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -923,7 +923,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; } diff --git a/src/game/BattleGround/BattleGround.h b/src/game/BattleGround/BattleGround.h index b6778fca8..f08720bcd 100644 --- a/src/game/BattleGround/BattleGround.h +++ b/src/game/BattleGround/BattleGround.h @@ -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 */ diff --git a/src/game/BattleGround/BattleGroundAB.h b/src/game/BattleGround/BattleGroundAB.h index 2a168be0b..6c9a53de0 100644 --- a/src/game/BattleGround/BattleGroundAB.h +++ b/src/game/BattleGround/BattleGroundAB.h @@ -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 */ diff --git a/src/game/BattleGround/BattleGroundEY.h b/src/game/BattleGround/BattleGroundEY.h index 910be0632..517e2ea21 100644 --- a/src/game/BattleGround/BattleGroundEY.h +++ b/src/game/BattleGround/BattleGroundEY.h @@ -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 diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8014bd927..5a74d58bb 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12146" + #define REVISION_NR "12147" #endif // __REVISION_NR_H__