diff options
| author | est31 <MTest31@outlook.com> | 2016-12-22 23:16:00 +0100 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2016-12-22 23:16:00 +0100 |
| commit | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (patch) | |
| tree | 1e9ef1be1b3295a8673d6e4f0bdeb4c2d3a6015f /src/genericobject.h | |
| parent | 8077612dcb48221281e726a60eb97bf73fde462b (diff) | |
| parent | 231ac33d34dfaaddf292c5f31b1eae43eeefba2d (diff) | |
| download | minetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.tar.gz minetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.tar.bz2 minetest-81d56b94919dceb7b2e51d70b21a7ca22f852bd5.zip | |
Merge 0.4.15 changes into stable-0.4
0.4.15 release!
Diffstat (limited to 'src/genericobject.h')
| -rw-r--r-- | src/genericobject.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/genericobject.h b/src/genericobject.h index b92570831..48e71db75 100644 --- a/src/genericobject.h +++ b/src/genericobject.h @@ -35,7 +35,8 @@ enum GenericCMD { GENERIC_CMD_SET_BONE_POSITION, GENERIC_CMD_ATTACH_TO, GENERIC_CMD_SET_PHYSICS_OVERRIDE, - GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES + GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES, + GENERIC_CMD_SPAWN_INFANT }; #include "object_properties.h" @@ -77,5 +78,7 @@ std::string gob_cmd_update_attachment(int parent_id, std::string bone, v3f posit std::string gob_cmd_update_nametag_attributes(video::SColor color); +std::string gob_cmd_update_infant(u16 id, u8 type, std::string client_initialization_data); + #endif |