mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[12147] Fix a bg achievement due to a missing change of [12067]

Browse source 
Note: This is what override correctness is used for :)

Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
stfx 2012-08-28 23:24:14 +02:00 • committed by Antz
parent 705f716cb1
commit caa36a0219
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/AchievementMgr.cpp
View file

@ -923,7 +923,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
case 156: // AB, win while controlling all 5 flags (all nodes) case 156: // AB, win while controlling all 5 flags (all nodes)
case 784: // EY, win while holding 4 bases (all nodes) case 784: // EY, win while holding 4 bases (all nodes)
{ {
if (!bg->IsAllNodesConrolledByTeam(GetPlayer()->GetTeam())) if (!bg->IsAllNodesControlledByTeam(GetPlayer()->GetTeam()))
continue; continue;
break; break;
} }

2
src/game/BattleGround/BattleGround.h
View file

@ -290,7 +290,7 @@ class BattleGround
virtual void StartingEventOpenDoors() {} virtual void StartingEventOpenDoors() {}
/* achievement req. */ /* 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; bool IsTeamScoreInRange(Team team, uint32 minScore, uint32 maxScore) const;
/* Battleground */ /* Battleground */

2
src/game/BattleGround/BattleGroundAB.h
View file

@ -202,7 +202,7 @@ class BattleGroundAB : public BattleGround
virtual void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override; virtual void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
/* achievement req. */ /* achievement req. */
bool IsAllNodesControlledByTeam(Team team) const; // overwrited bool IsAllNodesControlledByTeam(Team team) const override;
bool IsTeamScores500Disadvantage(Team team) const { return m_TeamScores500Disadvantage[GetTeamIndexByTeamId(team)]; } bool IsTeamScores500Disadvantage(Team team) const { return m_TeamScores500Disadvantage[GetTeamIndexByTeamId(team)]; }
private: private:
/* Gameobject spawning/despawning */ /* Gameobject spawning/despawning */

2
src/game/BattleGround/BattleGroundEY.h
View file

@ -283,7 +283,7 @@ class BattleGroundEY : public BattleGround
virtual void EventPlayerDroppedFlag(Player* source) override; virtual void EventPlayerDroppedFlag(Player* source) override;
/* achievement req. */ /* achievement req. */
bool IsAllNodesControlledByTeam(Team team) const; bool IsAllNodesControlledByTeam(Team team) const override;
private: private:
void EventPlayerCapturedFlag(Player* source, BG_EY_Nodes node); // NOTE: virtual BattleGround::EventPlayerCapturedFlag has different parameters list void EventPlayerCapturedFlag(Player* source, BG_EY_Nodes node); // NOTE: virtual BattleGround::EventPlayerCapturedFlag has different parameters list

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "12146" #define REVISION_NR "12147"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__