From 49c443896dcac8c4eaf08c4024e8bd2366ad899a Mon Sep 17 00:00:00 2001 From: LogicParrot Date: Sat, 2 Sep 2017 10:45:06 +0300 Subject: Revert "Replace ItemCallbacks with lambdas (#3948)" This reverts commit 496c337cdfa593654018c171f6a74c28272265b5. --- src/Server.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/Server.cpp') diff --git a/src/Server.cpp b/src/Server.cpp index 89dccb1f1..6ddb14ae5 100644 --- a/src/Server.cpp +++ b/src/Server.cpp @@ -498,20 +498,26 @@ void cServer::ExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCallbac } if (split[0] == "destroyentities") { - cRoot::Get()->ForEachWorld([](cWorld & a_World) + class WorldCallback : public cWorldListCallback + { + virtual bool Item(cWorld * a_World) override { - a_World.ForEachEntity([](cEntity & a_Entity) + class EntityCallback : public cEntityCallback + { + virtual bool Item(cEntity * a_Entity) override { - if (!a_Entity.IsPlayer()) + if (!a_Entity->IsPlayer()) { - a_Entity.Destroy(); + a_Entity->Destroy(); } return false; } - ); + } EC; + a_World->ForEachEntity(EC); return false; } - ); + } WC; + cRoot::Get()->ForEachWorld(WC); a_Output.Out("Destroyed all entities"); a_Output.Finished(); return; -- cgit v1.2.3