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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/genericobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/genericobject.cpp b/src/genericobject.cpp index 1976d5c80..654548fa1 100644 --- a/src/genericobject.cpp +++ b/src/genericobject.cpp @@ -92,11 +92,11 @@ std::string gob_cmd_set_sprite( return os.str(); } -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::ostringstream os(std::ios::binary); // command - writeU8(os, GENERIC_CMD_SET_ANIMATIONS); + writeU8(os, GENERIC_CMD_SET_ANIMATION); // parameters writeV2F1000(os, frames); writeF1000(os, frame_speed); @@ -104,11 +104,11 @@ std::string gob_cmd_update_animations(v2f frames, float frame_speed, float frame return os.str(); } -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::ostringstream os(std::ios::binary); // command - writeU8(os, GENERIC_CMD_SET_BONE_POSROT); + writeU8(os, GENERIC_CMD_SET_BONE_POSITION); // parameters os<<serializeString(bone); writeV3F1000(os, position); |