flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Replace ItemCallbacks with lambdas (#3948)

Browse Source
This commit is contained in:
peterbell10
2017-09-01 12:04:50 +01:00
committed by Mattes D
parent 09dfe0d811
commit 496c337cdf
67 changed files with 876 additions and 1834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Scoreboard.cpp
View File

@@ -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;
}