diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-03-30 12:51:51 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-03-30 12:51:51 +0300 |
| commit | 9e7ccedba4d9a94c7f2d20013c55e82aac3fe6a3 (patch) | |
| tree | a2139176c85cae0424f64edeb21d1a2f72bb2586 /src/genericobject.h | |
| parent | b9ffb5f30d64d365e6792d0d3acff552d9fcd0fd (diff) | |
| download | minetest-9e7ccedba4d9a94c7f2d20013c55e82aac3fe6a3.tar.gz minetest-9e7ccedba4d9a94c7f2d20013c55e82aac3fe6a3.tar.bz2 minetest-9e7ccedba4d9a94c7f2d20013c55e82aac3fe6a3.zip | |
ObjectProperties
Diffstat (limited to 'src/genericobject.h')
| -rw-r--r-- | src/genericobject.h | 16 |
1 files changed, 4 insertions, 12 deletions
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, |