diff options
| author | MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com> | 2012-11-12 16:35:10 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-11-25 19:14:24 +0200 |
| commit | 756db8174aa6a05eb998cfcec8eb5127053c5ea9 (patch) | |
| tree | af1c77b7bf4e6862095ef3524a995b0de49e606b /src/genericobject.h | |
| parent | fa67b46c042ed4df97102dabf9f1e7bc454b2acb (diff) | |
| download | minetest-756db8174aa6a05eb998cfcec8eb5127053c5ea9.tar.gz minetest-756db8174aa6a05eb998cfcec8eb5127053c5ea9.tar.bz2 minetest-756db8174aa6a05eb998cfcec8eb5127053c5ea9.zip | |
A bunch of fixes
No longer hide players who are dead. With models, a death animation should be used instead
Some changes requested by celeron55
Rename a lot of things in the code, and use better lua api function names
Minor code corrections
Bump protocol version up, since the models / animations / attachments code creates new client<->server messages
Diffstat (limited to 'src/genericobject.h')
| -rw-r--r-- | src/genericobject.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/genericobject.h b/src/genericobject.h index 34b8a8a51..a46a9474f 100644 --- a/src/genericobject.h +++ b/src/genericobject.h @@ -28,8 +28,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #define GENERIC_CMD_UPDATE_POSITION 1 #define GENERIC_CMD_SET_TEXTURE_MOD 2 #define GENERIC_CMD_SET_SPRITE 3 -#define GENERIC_CMD_SET_ANIMATIONS 4 -#define GENERIC_CMD_SET_BONE_POSROT 5 +#define GENERIC_CMD_SET_ANIMATION 4 +#define GENERIC_CMD_SET_BONE_POSITION 5 #define GENERIC_CMD_SET_ATTACHMENT 6 #define GENERIC_CMD_PUNCHED 7 #define GENERIC_CMD_UPDATE_ARMOR_GROUPS 8 @@ -57,9 +57,9 @@ std::string gob_cmd_set_sprite( bool select_horiz_by_yawpitch ); -std::string gob_cmd_update_animations(v2f frames, float frame_speed, float frame_blend); +std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend); -std::string gob_cmd_update_bone_posrot(std::string bone, v3f position, v3f rotation); +std::string gob_cmd_update_bone_position(std::string bone, v3f position, v3f rotation); std::string gob_cmd_update_attachment(int parent_id, std::string bone, v3f position, v3f rotation); |