X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2Fscript%2Fcpp_api%2Fs_inventory.h;h=e79b3d18b820b51a3138a113f3631a2f35e29f12;hb=52128ae11e8b1a7ce66a87c53f1b15f3aabe69f4;hp=d1a81de8026efcacceaa685fdb1490cc2a3a63df;hpb=3af90db5b51da0c37f77fe6410e488c8c27acd67;p=dragonfireclient.git

diff --git a/src/script/cpp_api/s_inventory.h b/src/script/cpp_api/s_inventory.h
index d1a81de80..e79b3d18b 100644
--- a/src/script/cpp_api/s_inventory.h
+++ b/src/script/cpp_api/s_inventory.h
@@ -17,11 +17,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef S_INVENTORY_H_
-#define S_INVENTORY_H_
+#pragma once
 
 #include "cpp_api/s_base.h"
 
+struct MoveAction;
 struct ItemStack;
 
 class ScriptApiDetached
@@ -31,41 +31,29 @@ class ScriptApiDetached
 	/* Detached inventory callbacks */
 	// Return number of accepted items to be moved
 	int detached_inventory_AllowMove(
-			const std::string &name,
-			const std::string &from_list, int from_index,
-			const std::string &to_list, int to_index,
-			int count, ServerActiveObject *player);
+			const MoveAction &ma, int count,
+			ServerActiveObject *player);
 	// Return number of accepted items to be put
 	int detached_inventory_AllowPut(
-			const std::string &name,
-			const std::string &listname, int index, ItemStack &stack,
+			const MoveAction &ma, const ItemStack &stack,
 			ServerActiveObject *player);
 	// Return number of accepted items to be taken
 	int detached_inventory_AllowTake(
-			const std::string &name,
-			const std::string &listname, int index, ItemStack &stack,
+			const MoveAction &ma, const ItemStack &stack,
 			ServerActiveObject *player);
 	// Report moved items
 	void detached_inventory_OnMove(
-			const std::string &name,
-			const std::string &from_list, int from_index,
-			const std::string &to_list, int to_index,
-			int count, ServerActiveObject *player);
+			const MoveAction &ma, int count,
+			ServerActiveObject *player);
 	// Report put items
 	void detached_inventory_OnPut(
-			const std::string &name,
-			const std::string &listname, int index, ItemStack &stack,
+			const MoveAction &ma, const ItemStack &stack,
 			ServerActiveObject *player);
 	// Report taken items
 	void detached_inventory_OnTake(
-			const std::string &name,
-			const std::string &listname, int index, ItemStack &stack,
+			const MoveAction &ma, const ItemStack &stack,
 			ServerActiveObject *player);
 private:
 	bool getDetachedInventoryCallback(
 			const std::string &name, const char *callbackname);
 };
-
-
-
-#endif /* S_INVENTORY_H_ */