summaryrefslogtreecommitdiffstats
path: root/src/UI/Window.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/UI/Window.h')
-rw-r--r--src/UI/Window.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/UI/Window.h b/src/UI/Window.h
index f2023c731..d7a29dc47 100644
--- a/src/UI/Window.h
+++ b/src/UI/Window.h
@@ -1,4 +1,4 @@
-
+
// Window.h
// Interfaces to the cWindow class representing a UI window for a specific block
@@ -9,7 +9,6 @@
#pragma once
-#include <functional>
#include "../ItemGrid.h"
@@ -32,8 +31,7 @@ class cWorld;
typedef std::list<cPlayer *> cPlayerList;
typedef std::vector<cSlotArea *> cSlotAreas;
-using cPlayerListCallback = std::function<bool(cPlayer &)>;
-using cClientHandleCallback = std::function<bool(cClientHandle &)>;
+
@@ -153,10 +151,10 @@ public:
void OwnerDestroyed(void);
/** Calls the callback safely for each player that has this window open; returns true if all players have been enumerated */
- bool ForEachPlayer(const cPlayerListCallback & a_Callback);
+ bool ForEachPlayer(cItemCallback<cPlayer> & a_Callback);
/** Calls the callback safely for each client that has this window open; returns true if all clients have been enumerated */
- bool ForEachClient(cClientHandleCallback & a_Callback);
+ bool ForEachClient(cItemCallback<cClientHandle> & a_Callback);
/** Called on shift-clicking to distribute the stack into other areas; Modifies a_ItemStack as it is distributed!
if a_ShouldApply is true, the changes are written into the slots;