X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgenericobject.h;h=06821007898dd96a006bd2758d4aa1ec0cfb9e17;hb=a869d2345161e30163f8007b6b833bceffd98ebb;hp=1ab7e26a668fe8246b1b64460a0c61f019600ae8;hpb=92ae11bd3b5e95ff837f98463931e7772c455ad3;p=oweals%2Fminetest.git

diff --git a/src/genericobject.h b/src/genericobject.h
index 1ab7e26a6..068210078 100644
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <string>
 #include "irrlichttypes.h"
+#include <iostream>
 
 #define GENERIC_CMD_SET_PROPERTIES 0
 #define GENERIC_CMD_UPDATE_POSITION 1
@@ -30,18 +31,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define GENERIC_CMD_PUNCHED 4
 #define GENERIC_CMD_UPDATE_ARMOR_GROUPS 5
 
-std::string gob_cmd_set_properties(
-	s16 hp_max,
-	bool physical,
-	float weight,
-	core::aabbox3d<f32> collisionbox,
-	std::string visual,
-	v2f visual_size,
-	core::array<std::string> textures,
-	v2s16 spritediv,
-	bool is_visible,
-	bool makes_footstep_sound
-);
+#include "object_properties.h"
+std::string gob_cmd_set_properties(const ObjectProperties &prop);
+ObjectProperties gob_read_set_properties(std::istream &is);
 
 std::string gob_cmd_update_position(
 	v3f position,