From cdd96a2f06041e89604c97caeea951342ed1b2e1 Mon Sep 17 00:00:00 2001
From: Foghrye4 <foghrye4@gmail.com>
Date: Sat, 14 May 2016 23:05:57 +0300
Subject: [PATCH 1/2] Prevent attached player models from disappearing during
area reload
Player models attached to e.g. boats can mysteriously dissapear if they inload due to zone-out and zone-in because child entities data is not updated when parent entity reloaded in area in client side.
This fix updates a server-side code, so server will send attached entity data to client to reinitialise then.
Fixes issue #3681
---
src/content_cao.cpp | 11 +++++++++++
src/content_sao.cpp | 18 ++++++++++++++++--
src/genericobject.cpp | 12 ++++++++++++
src/genericobject.h | 5 ++++-
4 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index d701e4f..896acac 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1776,6 +1776,17 @@ void GenericCAO::processMessage(const std::string &data)
m_nametag->nametag_color = m_prop.nametag_color;
}
}
+ else if (cmd == GENERIC_CMD_SPAWN_INFANT) {
+ u16 child_id = readU16(is);
+ u8 type = readU8(is);
+
+ GenericCAO *childobj = m_env->getGenericCAO(child_id);
+ if (childobj == NULL) {
+ m_env->addActiveObject(child_id, type, deSerializeLongString(is));
+ } else {
+ childobj->initialize(deSerializeLongString(is));
+ }
+ }
}
/* \pre punchitem != NULL
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 53bf315..7618c60 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -376,7 +376,7 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
writeF1000(os, m_yaw);
writeS16(os, m_hp);
- writeU8(os, 4 + m_bone_position.size()); // number of messages stuffed in here
+ writeU8(os, 4 + m_bone_position.size() + m_attachment_child_ids.size()); // number of messages stuffed in here
os<<serializeLongString(getPropertyPacket()); // message 1
os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
os<<serializeLongString(gob_cmd_update_animation(
@@ -385,6 +385,13 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
os<<serializeLongString(gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_bone_position.size
}
os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
+ for (std::set<int>::const_iterator ii = m_attachment_child_ids.begin();
+ ii != m_attachment_child_ids.end(); ++ii) {
+ ServerActiveObject *obj = m_env->getActiveObject(*ii);
+ if(obj){
+ os<<serializeLongString(gob_cmd_update_infant(*ii, obj->getSendType(), obj->getClientInitializationData(protocol_version)));
+ }
+ }
}
else
{
@@ -855,7 +862,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
writeF1000(os, m_player->getYaw());
writeS16(os, getHP());
- writeU8(os, 6 + m_bone_position.size()); // number of messages stuffed in here
+ writeU8(os, 6 + m_bone_position.size() + m_attachment_child_ids.size()); // number of messages stuffed in here
os<<serializeLongString(getPropertyPacket()); // message 1
os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
os<<serializeLongString(gob_cmd_update_animation(
@@ -868,6 +875,13 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
m_physics_override_jump, m_physics_override_gravity, m_physics_override_sneak,
m_physics_override_sneak_glitch)); // 5
os << serializeLongString(gob_cmd_update_nametag_attributes(m_prop.nametag_color)); // 6 (GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) : Deprecated, for backwards compatibility only.
+ for (std::set<int>::const_iterator ii = m_attachment_child_ids.begin();
+ ii != m_attachment_child_ids.end(); ++ii) {
+ ServerActiveObject *obj = m_env->getActiveObject(*ii);
+ if (obj) {
+ os<<serializeLongString(gob_cmd_update_infant(*ii, obj->getSendType(), obj->getClientInitializationData(protocol_version)));
+ }
+ }
}
else
{
diff --git a/src/genericobject.cpp b/src/genericobject.cpp
index 368cae1..c4660cf 100644
--- a/src/genericobject.cpp
+++ b/src/genericobject.cpp
@@ -182,3 +182,15 @@ std::string gob_cmd_update_nametag_attributes(video::SColor color)
writeARGB8(os, color);
return os.str();
}
+
+std::string gob_cmd_update_infant(u16 id, u8 type, std::string client_initialization_data)
+{
+ std::ostringstream os(std::ios::binary);
+ // command
+ writeU8(os, GENERIC_CMD_SPAWN_INFANT);
+ // parameters
+ writeU16(os, id);
+ writeU8(os, type);
+ os<<serializeLongString(client_initialization_data);
+ return os.str();
+}
diff --git a/src/genericobject.h b/src/genericobject.h
index b925708..48e71db 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
From 6711fdc7261da8b7690c2f03b1ebd1ecae985ac9 Mon Sep 17 00:00:00 2001
From: Foghrye4 <foghrye4@gmail.com>
Date: Sat, 8 Oct 2016 09:44:56 +0300
Subject: [PATCH 2/2] moving to UNORDERED_SET, code style
---
src/content_cao.cpp | 398 ++++++++++++++++++++++++++--------------------------
src/content_sao.cpp | 88 ++++++------
src/content_sao.h | 4 +-
src/genericobject.h | 1 -
4 files changed, 242 insertions(+), 249 deletions(-)
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 896acac..e1339fb 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1477,7 +1477,7 @@ void GenericCAO::updateTextures(const std::string &mod)
}
buf->getMaterial().setFlag(video::EMF_TRILINEAR_FILTER, use_trilinear_filter);
- buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, use_bilinear_filter);
+ buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, use_bilinear_filter);
buf->getMaterial().setFlag(video::EMF_ANISOTROPIC_FILTER, use_anisotropic_filter);
}
}
@@ -1572,220 +1572,216 @@ void GenericCAO::processMessage(const std::string &data)
std::istringstream is(data, std::ios::binary);
// command
u8 cmd = readU8(is);
- if(cmd == GENERIC_CMD_SET_PROPERTIES)
- {
- m_prop = gob_read_set_properties(is);
-
- m_selection_box = m_prop.collisionbox;
- m_selection_box.MinEdge *= BS;
- m_selection_box.MaxEdge *= BS;
-
- m_tx_size.X = 1.0 / m_prop.spritediv.X;
- m_tx_size.Y = 1.0 / m_prop.spritediv.Y;
-
- if(!m_initial_tx_basepos_set){
- m_initial_tx_basepos_set = true;
- m_tx_basepos = m_prop.initial_sprite_basepos;
- }
-
- if ((m_is_player && !m_is_local_player) && m_prop.nametag == "")
- m_prop.nametag = m_name;
-
- expireVisuals();
- }
- else if(cmd == GENERIC_CMD_UPDATE_POSITION)
- {
- // Not sent by the server if this object is an attachment.
- // We might however get here if the server notices the object being detached before the client.
- m_position = readV3F1000(is);
- m_velocity = readV3F1000(is);
- m_acceleration = readV3F1000(is);
- if(fabs(m_prop.automatic_rotate) < 0.001)
- m_yaw = readF1000(is);
- else
- readF1000(is);
- bool do_interpolate = readU8(is);
- bool is_end_position = readU8(is);
- float update_interval = readF1000(is);
-
- // Place us a bit higher if we're physical, to not sink into
- // the ground due to sucky collision detection...
- if(m_prop.physical)
- m_position += v3f(0,0.002,0);
-
- if(getParent() != NULL) // Just in case
- return;
-
- if(do_interpolate)
- {
- if(!m_prop.physical)
- pos_translator.update(m_position, is_end_position, update_interval);
- } else {
- pos_translator.init(m_position);
- }
- updateNodePos();
- }
- else if(cmd == GENERIC_CMD_SET_TEXTURE_MOD) {
- std::string mod = deSerializeString(is);
- updateTextures(mod);
- }
- else if(cmd == GENERIC_CMD_SET_SPRITE) {
- v2s16 p = readV2S16(is);
- int num_frames = readU16(is);
- float framelength = readF1000(is);
- bool select_horiz_by_yawpitch = readU8(is);
-
- m_tx_basepos = p;
- m_anim_num_frames = num_frames;
- m_anim_framelength = framelength;
- m_tx_select_horiz_by_yawpitch = select_horiz_by_yawpitch;
-
- updateTexturePos();
- }
- else if(cmd == GENERIC_CMD_SET_PHYSICS_OVERRIDE) {
- float override_speed = readF1000(is);
- float override_jump = readF1000(is);
- float override_gravity = readF1000(is);
- // these are sent inverted so we get true when the server sends nothing
- bool sneak = !readU8(is);
- bool sneak_glitch = !readU8(is);
-
-
- if(m_is_local_player)
- {
- LocalPlayer *player = m_env->getLocalPlayer();
- player->physics_override_speed = override_speed;
- player->physics_override_jump = override_jump;
- player->physics_override_gravity = override_gravity;
- player->physics_override_sneak = sneak;
- player->physics_override_sneak_glitch = sneak_glitch;
- }
- }
- else if(cmd == GENERIC_CMD_SET_ANIMATION) {
- // TODO: change frames send as v2s32 value
- v2f range = readV2F1000(is);
- if (!m_is_local_player) {
- m_animation_range = v2s32((s32)range.X, (s32)range.Y);
- m_animation_speed = readF1000(is);
- m_animation_blend = readF1000(is);
- // these are sent inverted so we get true when the server sends nothing
- m_animation_loop = !readU8(is);
- updateAnimation();
- } else {
- LocalPlayer *player = m_env->getLocalPlayer();
- if(player->last_animation == NO_ANIM)
+ switch (cmd) {
+ case GENERIC_CMD_SET_PROPERTIES:
+ m_prop = gob_read_set_properties(is);
+
+ m_selection_box = m_prop.collisionbox;
+ m_selection_box.MinEdge *= BS;
+ m_selection_box.MaxEdge *= BS;
+
+ m_tx_size.X = 1.0 / m_prop.spritediv.X;
+ m_tx_size.Y = 1.0 / m_prop.spritediv.Y;
+
+ if (!m_initial_tx_basepos_set) {
+ m_initial_tx_basepos_set = true;
+ m_tx_basepos = m_prop.initial_sprite_basepos;
+ }
+
+ if ((m_is_player && !m_is_local_player) && m_prop.nametag == "")
+ m_prop.nametag = m_name;
+
+ expireVisuals();
+ break;
+ case GENERIC_CMD_UPDATE_POSITION:
+ // Not sent by the server if this object is an attachment.
+ // We might however get here if the server notices the object being detached before the client.
+ m_position = readV3F1000(is);
+ m_velocity = readV3F1000(is);
+ m_acceleration = readV3F1000(is);
+ if (fabs(m_prop.automatic_rotate) < 0.001)
+ m_yaw = readF1000(is);
+ else
+ readF1000(is);
+ bool do_interpolate = readU8(is);
+ bool is_end_position = readU8(is);
+ float update_interval = readF1000(is);
+
+ // Place us a bit higher if we're physical, to not sink into
+ // the ground due to sucky collision detection...
+ if (m_prop.physical)
+ m_position += v3f(0,0.002,0);
+
+ if (getParent()) // Just in case
+ return;
+
+ if (do_interpolate)
{
+ if (!m_prop.physical)
+ pos_translator.update(m_position, is_end_position, update_interval);
+ } else {
+ pos_translator.init(m_position);
+ }
+ updateNodePos();
+ break;
+ case GENERIC_CMD_SET_TEXTURE_MOD:
+ std::string mod = deSerializeString(is);
+ updateTextures(mod);
+ break;
+ case GENERIC_CMD_SET_SPRITE:
+ v2s16 p = readV2S16(is);
+ int num_frames = readU16(is);
+ float framelength = readF1000(is);
+ bool select_horiz_by_yawpitch = readU8(is);
+
+ m_tx_basepos = p;
+ m_anim_num_frames = num_frames;
+ m_anim_framelength = framelength;
+ m_tx_select_horiz_by_yawpitch = select_horiz_by_yawpitch;
+
+ updateTexturePos();
+ break;
+ case GENERIC_CMD_SET_PHYSICS_OVERRIDE:
+ float override_speed = readF1000(is);
+ float override_jump = readF1000(is);
+ float override_gravity = readF1000(is);
+ // these are sent inverted so we get true when the server sends nothing
+ bool sneak = !readU8(is);
+ bool sneak_glitch = !readU8(is);
+ if (m_is_local_player) {
+ LocalPlayer *player = m_env->getLocalPlayer();
+ player->physics_override_speed = override_speed;
+ player->physics_override_jump = override_jump;
+ player->physics_override_gravity = override_gravity;
+ player->physics_override_sneak = sneak;
+ player->physics_override_sneak_glitch = sneak_glitch;
+ }
+ break;
+ case GENERIC_CMD_SET_ANIMATION:
+ // TODO: change frames send as v2s32 value
+ v2f range = readV2F1000(is);
+ if (!m_is_local_player) {
m_animation_range = v2s32((s32)range.X, (s32)range.Y);
m_animation_speed = readF1000(is);
m_animation_blend = readF1000(is);
// these are sent inverted so we get true when the server sends nothing
m_animation_loop = !readU8(is);
- }
- // update animation only if local animations present
- // and received animation is unknown (except idle animation)
- bool is_known = false;
- for (int i = 1;i<4;i++)
- {
- if(m_animation_range.Y == player->local_animations[i].Y)
- is_known = true;
- }
- if(!is_known ||
- (player->local_animations[1].Y + player->local_animations[2].Y < 1))
- {
+ updateAnimation();
+ } else {
+ LocalPlayer *player = m_env->getLocalPlayer();
+ if (player->last_animation == NO_ANIM) {
+ m_animation_range = v2s32((s32)range.X, (s32)range.Y);
+ m_animation_speed = readF1000(is);
+ m_animation_blend = readF1000(is);
+ // these are sent inverted so we get true when the server sends nothing
+ m_animation_loop = !readU8(is);
+ }
+ // update animation only if local animations present
+ // and received animation is unknown (except idle animation)
+ bool is_known = false;
+ for (int i = 1; i < 4; i++) {
+ if (m_animation_range.Y == player->local_animations[i].Y)
+ is_known = true;
+ }
+ if (!is_known || (player->local_animations[1].Y + player->local_animations[2].Y < 1)) {
updateAnimation();
+ }
}
- }
- }
- else if(cmd == GENERIC_CMD_SET_BONE_POSITION) {
- std::string bone = deSerializeString(is);
- v3f position = readV3F1000(is);
- v3f rotation = readV3F1000(is);
- m_bone_position[bone] = core::vector2d<v3f>(position, rotation);
-
- updateBonePosition();
- } else if (cmd == GENERIC_CMD_ATTACH_TO) {
- u16 parentID = readS16(is);
- u16 oldparent = m_env->attachement_parent_ids[getId()];
- if (oldparent) {
- m_children.erase(std::remove(m_children.begin(), m_children.end(),
- getId()), m_children.end());
- }
- m_env->attachement_parent_ids[getId()] = parentID;
- GenericCAO *parentobj = m_env->getGenericCAO(parentID);
-
- if (parentobj) {
- parentobj->m_children.push_back(getId());
- }
-
- m_attachment_bone = deSerializeString(is);
- m_attachment_position = readV3F1000(is);
- m_attachment_rotation = readV3F1000(is);
-
- // localplayer itself can't be attached to localplayer
- if (!m_is_local_player) {
- m_attached_to_local = getParent() != NULL && getParent()->isLocalPlayer();
- // Objects attached to the local player should be hidden by default
- m_is_visible = !m_attached_to_local;
- }
+ break;
+ case GENERIC_CMD_SET_BONE_POSITION:
+ std::string bone = deSerializeString(is);
+ v3f position = readV3F1000(is);
+ v3f rotation = readV3F1000(is);
+ m_bone_position[bone] = core::vector2d<v3f>(position, rotation);
+
+ updateBonePosition();
+ break;
+ case GENERIC_CMD_ATTACH_TO:
+ u16 parentID = readS16(is);
+ u16 oldparent = m_env->attachement_parent_ids[getId()];
+ if (oldparent) {
+ m_children.erase(std::remove(m_children.begin(), m_children.end(),
+ getId()), m_children.end());
+ }
+ m_env->attachement_parent_ids[getId()] = parentID;
+ GenericCAO *parentobj = m_env->getGenericCAO(parentID);
- updateAttachments();
- }
- else if(cmd == GENERIC_CMD_PUNCHED) {
- /*s16 damage =*/ readS16(is);
- s16 result_hp = readS16(is);
+ if (parentobj) {
+ parentobj->m_children.push_back(getId());
+ }
- // Use this instead of the send damage to not interfere with prediction
- s16 damage = m_hp - result_hp;
+ m_attachment_bone = deSerializeString(is);
+ m_attachment_position = readV3F1000(is);
+ m_attachment_rotation = readV3F1000(is);
+
+ // localplayer itself can't be attached to localplayer
+ if (!m_is_local_player) {
+ m_attached_to_local = getParent() != NULL && getParent()->isLocalPlayer();
+ // Objects attached to the local player should be hidden by default
+ m_is_visible = !m_attached_to_local;
+ }
- m_hp = result_hp;
+ updateAttachments();
+ break;
+ case GENERIC_CMD_PUNCHED:
+ /*s16 damage =*/ readS16(is);
+ s16 result_hp = readS16(is);
+
+ // Use this instead of the send damage to not interfere with prediction
+ s16 damage = m_hp - result_hp;
+
+ m_hp = result_hp;
+
+ if (damage > 0) {
+ if (m_hp <= 0) {
+ // TODO: Execute defined fast response
+ // As there is no definition, make a smoke puff
+ ClientSimpleObject *simple = createSmokePuff(
+ m_smgr, m_env, m_position,
+ m_prop.visual_size * BS);
+ m_env->addSimpleObject(simple);
+ } else {
+ // TODO: Execute defined fast response
+ // Flashing shall suffice as there is no definition
+ m_reset_textures_timer = 0.05;
+ if(damage >= 2)
+ m_reset_textures_timer += 0.05 * damage;
+ updateTextures("^[brighten");
+ }
+ }
+ break;
+ case GENERIC_CMD_UPDATE_ARMOR_GROUPS:
+ m_armor_groups.clear();
+ int armor_groups_size = readU16(is);
+ for (int i = 0; i < armor_groups_size; i++) {
+ std::string name = deSerializeString(is);
+ int rating = readS16(is);
+ m_armor_groups[name] = rating;
+ }
+ break;
+ case GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES:
+ // Deprecated, for backwards compatibility only.
+ readU8(is); // version
+ m_prop.nametag_color = readARGB8(is);
+ if (m_nametag) {
+ m_nametag->nametag_color = m_prop.nametag_color;
+ }
+ break;
+ case GENERIC_CMD_SPAWN_INFANT:
+ u16 child_id = readU16(is);
+ u8 type = readU8(is);
- if (damage > 0)
- {
- if (m_hp <= 0)
- {
- // TODO: Execute defined fast response
- // As there is no definition, make a smoke puff
- ClientSimpleObject *simple = createSmokePuff(
- m_smgr, m_env, m_position,
- m_prop.visual_size * BS);
- m_env->addSimpleObject(simple);
+ if (GenericCAO *childobj = m_env->getGenericCAO(child_id)) {
+ childobj->initialize(deSerializeLongString(is));
} else {
- // TODO: Execute defined fast response
- // Flashing shall suffice as there is no definition
- m_reset_textures_timer = 0.05;
- if(damage >= 2)
- m_reset_textures_timer += 0.05 * damage;
- updateTextures("^[brighten");
+ m_env->addActiveObject(child_id, type, deSerializeLongString(is));
}
- }
- }
- else if(cmd == GENERIC_CMD_UPDATE_ARMOR_GROUPS) {
- m_armor_groups.clear();
- int armor_groups_size = readU16(is);
- for(int i=0; i<armor_groups_size; i++)
- {
- std::string name = deSerializeString(is);
- int rating = readS16(is);
- m_armor_groups[name] = rating;
- }
- } else if (cmd == GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) {
- // Deprecated, for backwards compatibility only.
- readU8(is); // version
- m_prop.nametag_color = readARGB8(is);
- if (m_nametag != NULL) {
- m_nametag->nametag_color = m_prop.nametag_color;
- }
- }
- else if (cmd == GENERIC_CMD_SPAWN_INFANT) {
- u16 child_id = readU16(is);
- u8 type = readU8(is);
-
- GenericCAO *childobj = m_env->getGenericCAO(child_id);
- if (childobj == NULL) {
- m_env->addActiveObject(child_id, type, deSerializeLongString(is));
- } else {
- childobj->initialize(deSerializeLongString(is));
- }
+ break;
+ default:
+ warningstream<<FUNCTION_NAME
+ <<": unknown command or outdated client \""
+ <<cmd<<std::endl;
+ break
}
}
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 7618c60..0dfece9 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -9,7 +9,7 @@ the Free Software Foundation; either version 2.1 of the License, or
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
@@ -204,8 +204,8 @@ ServerActiveObject* LuaEntitySAO::create(ServerEnvironment *env, v3f pos,
}
}
// create object
- infostream<<"LuaEntitySAO::create(name=\""<<name<<"\" state=\""
- <<state<<"\")"<<std::endl;
+ infostream << "LuaEntitySAO::create(name=\"" << name << "\" state=\""
+ << state << "\")" << std::endl;
LuaEntitySAO *sao = new LuaEntitySAO(env, pos, name, state);
sao->m_hp = hp;
sao->m_velocity = velocity;
@@ -369,7 +369,7 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
if(protocol_version >= 14)
{
writeU8(os, 1); // version
- os<<serializeString(""); // name
+ os << serializeString(""); // name
writeU8(os, 0); // is_player
writeS16(os, getId()); //id
writeV3F1000(os, m_base_position);
@@ -377,33 +377,32 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
writeS16(os, m_hp);
writeU8(os, 4 + m_bone_position.size() + m_attachment_child_ids.size()); // number of messages stuffed in here
- os<<serializeLongString(getPropertyPacket()); // message 1
- os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
- os<<serializeLongString(gob_cmd_update_animation(
+ os << serializeLongString(getPropertyPacket()); // message 1
+ os << serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
+ os << serializeLongString(gob_cmd_update_animation(
m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop)); // 3
for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
- os<<serializeLongString(gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_bone_position.size
+ os << serializeLongString(gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_bone_position.size
}
- os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
- for (std::set<int>::const_iterator ii = m_attachment_child_ids.begin();
+ os << serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
+ for (UNORDERED_SET<int>::const_iterator ii = m_attachment_child_ids.begin();
ii != m_attachment_child_ids.end(); ++ii) {
- ServerActiveObject *obj = m_env->getActiveObject(*ii);
- if(obj){
- os<<serializeLongString(gob_cmd_update_infant(*ii, obj->getSendType(), obj->getClientInitializationData(protocol_version)));
+ if (ServerActiveObject *obj = m_env->getActiveObject(*ii)) {
+ os << serializeLongString(gob_cmd_update_infant(*ii, obj->getSendType(), obj->getClientInitializationData(protocol_version)));
}
}
}
else
{
writeU8(os, 0); // version
- os<<serializeString(""); // name
+ os << serializeString(""); // name
writeU8(os, 0); // is_player
writeV3F1000(os, m_base_position);
writeF1000(os, m_yaw);
writeS16(os, m_hp);
writeU8(os, 2); // number of messages stuffed in here
- os<<serializeLongString(getPropertyPacket()); // message 1
- os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
+ os << serializeLongString(getPropertyPacket()); // message 1
+ os << serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
}
// return result
@@ -412,19 +411,19 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
std::string LuaEntitySAO::getStaticData()
{
- verbosestream<<FUNCTION_NAME<<std::endl;
+ verbosestream << FUNCTION_NAME << std::endl;
std::ostringstream os(std::ios::binary);
// version
writeU8(os, 1);
// name
- os<<serializeString(m_init_name);
+ os << serializeString(m_init_name);
// state
if(m_registered){
std::string state = m_env->getScriptIface()->
luaentity_GetStaticdata(m_id);
- os<<serializeLongString(state);
+ os << serializeLongString(state);
} else {
- os<<serializeLongString(m_init_state);
+ os << serializeLongString(m_init_state);
}
// hp
writeS16(os, m_hp);
@@ -524,11 +523,11 @@ float LuaEntitySAO::getMinimumSavedMovement()
std::string LuaEntitySAO::getDescription()
{
std::ostringstream os(std::ios::binary);
- os<<"LuaEntitySAO at (";
- os<<(m_base_position.X/BS)<<",";
- os<<(m_base_position.Y/BS)<<",";
- os<<(m_base_position.Z/BS);
- os<<")";
+ os << "LuaEntitySAO at (";
+ os << (m_base_position.X/BS) << ",";
+ os << (m_base_position.Y/BS) << ",";
+ os << (m_base_position.Z/BS);
+ os << ")";
return os.str();
}
@@ -619,7 +618,7 @@ void LuaEntitySAO::removeAttachmentChild(int child_id)
m_attachment_child_ids.erase(child_id);
}
-std::set<int> LuaEntitySAO::getAttachmentChildIds()
+UNORDERED_SET<int> LuaEntitySAO::getAttachmentChildIds()
{
return m_attachment_child_ids;
}
@@ -855,7 +854,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
if(protocol_version >= 15)
{
writeU8(os, 1); // version
- os<<serializeString(m_player->getName()); // name
+ os << serializeString(m_player->getName()); // name
writeU8(os, 1); // is_player
writeS16(os, getId()); //id
writeV3F1000(os, m_player->getPosition() + v3f(0,BS*1,0));
@@ -863,37 +862,36 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
writeS16(os, getHP());
writeU8(os, 6 + m_bone_position.size() + m_attachment_child_ids.size()); // number of messages stuffed in here
- os<<serializeLongString(getPropertyPacket()); // message 1
- os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
- os<<serializeLongString(gob_cmd_update_animation(
+ os << serializeLongString(getPropertyPacket()); // message 1
+ os << serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
+ os << serializeLongString(gob_cmd_update_animation(
m_animation_range, m_animation_speed, m_animation_blend, m_animation_loop)); // 3
for(std::map<std::string, core::vector2d<v3f> >::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii){
- os<<serializeLongString(gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_bone_position.size
+ os << serializeLongString(gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_bone_position.size
}
- os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
- os<<serializeLongString(gob_cmd_update_physics_override(m_physics_override_speed,
+ os << serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
+ os << serializeLongString(gob_cmd_update_physics_override(m_physics_override_speed,
m_physics_override_jump, m_physics_override_gravity, m_physics_override_sneak,
m_physics_override_sneak_glitch)); // 5
os << serializeLongString(gob_cmd_update_nametag_attributes(m_prop.nametag_color)); // 6 (GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) : Deprecated, for backwards compatibility only.
- for (std::set<int>::const_iterator ii = m_attachment_child_ids.begin();
+ for (UNORDERED_SET<int>::const_iterator ii = m_attachment_child_ids.begin();
ii != m_attachment_child_ids.end(); ++ii) {
- ServerActiveObject *obj = m_env->getActiveObject(*ii);
- if (obj) {
- os<<serializeLongString(gob_cmd_update_infant(*ii, obj->getSendType(), obj->getClientInitializationData(protocol_version)));
+ if (ServerActiveObject *obj = m_env->getActiveObject(*ii)) {
+ os << serializeLongString(gob_cmd_update_infant(*ii, obj->getSendType(), obj->getClientInitializationData(protocol_version)));
}
}
}
else
{
writeU8(os, 0); // version
- os<<serializeString(m_player->getName()); // name
+ os << serializeString(m_player->getName()); // name
writeU8(os, 1); // is_player
writeV3F1000(os, m_player->getPosition() + v3f(0,BS*1,0));
writeF1000(os, m_player->getYaw());
writeS16(os, getHP());
writeU8(os, 2); // number of messages stuffed in here
- os<<serializeLongString(getPropertyPacket()); // message 1
- os<<serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
+ os << serializeLongString(getPropertyPacket()); // message 1
+ os << serializeLongString(gob_cmd_update_armor_groups(m_armor_groups)); // 2
}
// return result
@@ -939,7 +937,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
((Server*)m_env->getGameDef())->SendMovePlayer(m_peer_id);
}
- //dstream<<"PlayerSAO::step: dtime: "<<dtime<<std::endl;
+ //dstream << "PlayerSAO::step: dtime: "<<dtime<<std::endl;
// Set lag pool maximums based on estimated lag
const float LAG_POOL_MIN = 5.0;
@@ -1271,7 +1269,7 @@ void PlayerSAO::removeAttachmentChild(int child_id)
m_attachment_child_ids.erase(child_id);
}
-std::set<int> PlayerSAO::getAttachmentChildIds()
+UNORDERED_SET<int> PlayerSAO::getAttachmentChildIds()
{
return m_attachment_child_ids;
}
@@ -1378,9 +1376,9 @@ bool PlayerSAO::checkMovementCheat()
if(m_move_pool.grab(required_time)){
m_last_good_position = m_player->getPosition();
} else {
- actionstream<<"Player "<<m_player->getName()
- <<" moved too fast; resetting position"
- <<std::endl;
+ actionstream << "Player " << m_player->getName()
+ << " moved too fast; resetting position"
+ << std::endl;
m_player->setPosition(m_last_good_position);
cheated = true;
}
diff --git a/src/content_sao.h b/src/content_sao.h
index 44d40d3..8d5a3cb 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -116,7 +116,7 @@ class LuaEntitySAO : public ServerActiveObject
bool m_bone_position_sent;
int m_attachment_parent_id;
- std::set<int> m_attachment_child_ids;
+ UNORDERED_SET<int> m_attachment_child_ids;
std::string m_attachment_bone;
v3f m_attachment_position;
v3f m_attachment_rotation;
@@ -325,7 +325,7 @@ class PlayerSAO : public ServerActiveObject
bool m_bone_position_sent;
int m_attachment_parent_id;
- std::set<int> m_attachment_child_ids;
+ UNORDERED_SET<int> m_attachment_child_ids;
std::string m_attachment_bone;
v3f m_attachment_position;
v3f m_attachment_rotation;
diff --git a/src/genericobject.h b/src/genericobject.h
index 48e71db..11e4c10 100644
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -81,4 +81,3 @@ 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
-