projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
num_emerge_threads: Initialise value to cope with setting syntax error (#8396)
[oweals/minetest.git]
/
src
/
genericobject.cpp
diff --git
a/src/genericobject.cpp
b/src/genericobject.cpp
index 58f4b997e828067dee65f7c92ecfd8f250cc88e8..49d16001ff15293b34a1ab0e175c678ce460c4b9 100644
(file)
--- a/
src/genericobject.cpp
+++ b/
src/genericobject.cpp
@@
-40,7
+40,7
@@
std::string gob_cmd_update_position(
v3f position,
v3f velocity,
v3f acceleration,
v3f position,
v3f velocity,
v3f acceleration,
-
f32 yaw
,
+
v3f rotation
,
bool do_interpolate,
bool is_movement_end,
f32 update_interval
bool do_interpolate,
bool is_movement_end,
f32 update_interval
@@
-49,19
+49,19
@@
std::string gob_cmd_update_position(
// command
writeU8(os, GENERIC_CMD_UPDATE_POSITION);
// pos
// command
writeU8(os, GENERIC_CMD_UPDATE_POSITION);
// pos
- writeV3F
1000
(os, position);
+ writeV3F
32
(os, position);
// velocity
// velocity
- writeV3F
1000
(os, velocity);
+ writeV3F
32
(os, velocity);
// acceleration
// acceleration
- writeV3F
1000
(os, acceleration);
- //
yaw
- write
F1000(os, yaw
);
+ writeV3F
32
(os, acceleration);
+ //
rotation
+ write
V3F32(os, rotation
);
// do_interpolate
writeU8(os, do_interpolate);
// is_end_position (for interpolation)
writeU8(os, is_movement_end);
// update_interval (for interpolation)
// do_interpolate
writeU8(os, do_interpolate);
// is_end_position (for interpolation)
writeU8(os, is_movement_end);
// update_interval (for interpolation)
- writeF
1000
(os, update_interval);
+ writeF
32
(os, update_interval);
return os.str();
}
return os.str();
}
@@
-87,20
+87,18
@@
std::string gob_cmd_set_sprite(
// parameters
writeV2S16(os, p);
writeU16(os, num_frames);
// parameters
writeV2S16(os, p);
writeU16(os, num_frames);
- writeF
1000
(os, framelength);
+ writeF
32
(os, framelength);
writeU8(os, select_horiz_by_yawpitch);
return os.str();
}
writeU8(os, select_horiz_by_yawpitch);
return os.str();
}
-std::string gob_cmd_punched(
s16 damage, s
16 result_hp)
+std::string gob_cmd_punched(
u
16 result_hp)
{
std::ostringstream os(std::ios::binary);
// command
writeU8(os, GENERIC_CMD_PUNCHED);
{
std::ostringstream os(std::ios::binary);
// command
writeU8(os, GENERIC_CMD_PUNCHED);
- // damage
- writeS16(os, damage);
// result_hp
// result_hp
- write
S
16(os, result_hp);
+ write
U
16(os, result_hp);
return os.str();
}
return os.str();
}
@@
-109,10
+107,9
@@
std::string gob_cmd_update_armor_groups(const ItemGroupList &armor_groups)
std::ostringstream os(std::ios::binary);
writeU8(os, GENERIC_CMD_UPDATE_ARMOR_GROUPS);
writeU16(os, armor_groups.size());
std::ostringstream os(std::ios::binary);
writeU8(os, GENERIC_CMD_UPDATE_ARMOR_GROUPS);
writeU16(os, armor_groups.size());
- for(ItemGroupList::const_iterator i = armor_groups.begin();
- i != armor_groups.end(); ++i){
- os<<serializeString(i->first);
- writeS16(os, i->second);
+ for (const auto &armor_group : armor_groups) {
+ os<<serializeString(armor_group.first);
+ writeS16(os, armor_group.second);
}
return os.str();
}
}
return os.str();
}
@@
-124,9
+121,9
@@
std::string gob_cmd_update_physics_override(float physics_override_speed, float
// command
writeU8(os, GENERIC_CMD_SET_PHYSICS_OVERRIDE);
// parameters
// command
writeU8(os, GENERIC_CMD_SET_PHYSICS_OVERRIDE);
// parameters
- writeF
1000
(os, physics_override_speed);
- writeF
1000
(os, physics_override_jump);
- writeF
1000
(os, physics_override_gravity);
+ writeF
32
(os, physics_override_speed);
+ writeF
32
(os, physics_override_jump);
+ writeF
32
(os, physics_override_gravity);
// these are sent inverted so we get true when the server sends nothing
writeU8(os, !sneak);
writeU8(os, !sneak_glitch);
// these are sent inverted so we get true when the server sends nothing
writeU8(os, !sneak);
writeU8(os, !sneak_glitch);
@@
-140,14
+137,24
@@
std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_
// command
writeU8(os, GENERIC_CMD_SET_ANIMATION);
// parameters
// command
writeU8(os, GENERIC_CMD_SET_ANIMATION);
// parameters
- writeV2F
1000
(os, frames);
- writeF
1000
(os, frame_speed);
- writeF
1000
(os, frame_blend);
+ writeV2F
32
(os, frames);
+ writeF
32
(os, frame_speed);
+ writeF
32
(os, frame_blend);
// these are sent inverted so we get true when the server sends nothing
writeU8(os, !frame_loop);
return os.str();
}
// these are sent inverted so we get true when the server sends nothing
writeU8(os, !frame_loop);
return os.str();
}
+std::string gob_cmd_update_animation_speed(float frame_speed)
+{
+ std::ostringstream os(std::ios::binary);
+ // command
+ writeU8(os, GENERIC_CMD_SET_ANIMATION_SPEED);
+ // parameters
+ writeF32(os, frame_speed);
+ return os.str();
+}
+
std::string gob_cmd_update_bone_position(const std::string &bone, v3f position,
v3f rotation)
{
std::string gob_cmd_update_bone_position(const std::string &bone, v3f position,
v3f rotation)
{
@@
-156,8
+163,8
@@
std::string gob_cmd_update_bone_position(const std::string &bone, v3f position,
writeU8(os, GENERIC_CMD_SET_BONE_POSITION);
// parameters
os<<serializeString(bone);
writeU8(os, GENERIC_CMD_SET_BONE_POSITION);
// parameters
os<<serializeString(bone);
- writeV3F
1000
(os, position);
- writeV3F
1000
(os, rotation);
+ writeV3F
32
(os, position);
+ writeV3F
32
(os, rotation);
return os.str();
}
return os.str();
}
@@
-170,8
+177,8
@@
std::string gob_cmd_update_attachment(int parent_id, const std::string &bone,
// parameters
writeS16(os, parent_id);
os<<serializeString(bone);
// parameters
writeS16(os, parent_id);
os<<serializeString(bone);
- writeV3F
1000
(os, position);
- writeV3F
1000
(os, rotation);
+ writeV3F
32
(os, position);
+ writeV3F
32
(os, rotation);
return os.str();
}
return os.str();
}