diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2017-09-01 13:04:50 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2017-09-01 13:04:50 +0200 |
| commit | 496c337cdfa593654018c171f6a74c28272265b5 (patch) | |
| tree | fab48316d8fd6de97500ca1b8c8c5792eb578acc /src/Scoreboard.cpp | |
| parent | Update Core plugin (diff) | |
| download | cuberite-496c337cdfa593654018c171f6a74c28272265b5.tar cuberite-496c337cdfa593654018c171f6a74c28272265b5.tar.gz cuberite-496c337cdfa593654018c171f6a74c28272265b5.tar.bz2 cuberite-496c337cdfa593654018c171f6a74c28272265b5.tar.lz cuberite-496c337cdfa593654018c171f6a74c28272265b5.tar.xz cuberite-496c337cdfa593654018c171f6a74c28272265b5.tar.zst cuberite-496c337cdfa593654018c171f6a74c28272265b5.zip | |
Diffstat (limited to 'src/Scoreboard.cpp')
| -rw-r--r-- | src/Scoreboard.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Scoreboard.cpp b/src/Scoreboard.cpp index 4dde5b2dd..5faf88f39 100644 --- a/src/Scoreboard.cpp +++ b/src/Scoreboard.cpp @@ -1,4 +1,4 @@ - + // Scoreboard.cpp // Implementation of a scoreboard that keeps track of specified objectives @@ -487,7 +487,7 @@ cObjective * cScoreboard::GetObjectiveIn(eDisplaySlot a_Slot) -bool cScoreboard::ForEachObjectiveWith(cObjective::eType a_Type, cObjectiveCallback & a_Callback) +bool cScoreboard::ForEachObjectiveWith(cObjective::eType a_Type, const cObjectiveCallback & a_Callback) { cCSLock Lock(m_CSObjectives); @@ -496,7 +496,7 @@ bool cScoreboard::ForEachObjectiveWith(cObjective::eType a_Type, cObjectiveCallb if (it->second.GetType() == a_Type) { // Call callback - if (a_Callback.Item(&it->second)) + if (a_Callback(it->second)) { return false; } @@ -509,14 +509,14 @@ bool cScoreboard::ForEachObjectiveWith(cObjective::eType a_Type, cObjectiveCallb -bool cScoreboard::ForEachObjective(cObjectiveCallback & a_Callback) +bool cScoreboard::ForEachObjective(const cObjectiveCallback & a_Callback) { cCSLock Lock(m_CSObjectives); for (cObjectiveMap::iterator it = m_Objectives.begin(); it != m_Objectives.end(); ++it) { // Call callback - if (a_Callback.Item(&it->second)) + if (a_Callback(it->second)) { return false; } @@ -528,14 +528,14 @@ bool cScoreboard::ForEachObjective(cObjectiveCallback & a_Callback) -bool cScoreboard::ForEachTeam(cTeamCallback & a_Callback) +bool cScoreboard::ForEachTeam(const cTeamCallback & a_Callback) { cCSLock Lock(m_CSTeams); for (cTeamMap::iterator it = m_Teams.begin(); it != m_Teams.end(); ++it) { // Call callback - if (a_Callback.Item(&it->second)) + if (a_Callback(it->second)) { return false; } |