diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp index d32d9079b29..f21171a0667 100644 --- a/src/game/AchievementMgr.cpp +++ b/src/game/AchievementMgr.cpp @@ -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; } diff --git a/src/game/BattleGround/BattleGround.h b/src/game/BattleGround/BattleGround.h index b6778fca8d1..f08720bcd60 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 2a168be0bf3..6c9a53de0ca 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 910be063240..517e2ea2160 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 aac7285ec6b..1b0b0a87ac5 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 "12129" + #define REVISION_NR "12130" #endif // __REVISION_NR_H__