Add '/clearobjects quick'

[minetest.git] / src / content_sao.cpp

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 386b7e070d160fb4d083b452c67b48029d9eff70..fa24548216f37bc7a37d4634facc3da3384a3c06 100644 (file)
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "collision.h"
 #include "environment.h"
 #include "settings.h"
-#include "profiler.h"
 #include "serialization.h" // For compressZlib
 #include "tool.h" // For ToolCapabilities
 #include "gamedef.h"
@@ -270,7 +269,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
                        v3f p_acceleration = m_acceleration;
                        moveresult = collisionMoveSimple(m_env,m_env->getGameDef(),
                                        pos_max_d, box, m_prop.stepheight, dtime,
-                                       p_pos, p_velocity, p_acceleration,
+                                       &p_pos, &p_velocity, p_acceleration,
                                        this, m_prop.collideWithObjects);
 
                        // Apply results
@@ -284,8 +283,20 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
                }
 
                if((m_prop.automatic_face_movement_dir) &&
-                               (fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001)){
-                       m_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI + m_prop.automatic_face_movement_dir_offset;
+                               (fabs(m_velocity.Z) > 0.001 || fabs(m_velocity.X) > 0.001))
+               {
+                       float optimal_yaw = atan2(m_velocity.Z,m_velocity.X) * 180 / M_PI
+                                       + m_prop.automatic_face_movement_dir_offset;
+                       float max_rotation_delta =
+                                       dtime * m_prop.automatic_face_movement_max_rotation_per_sec;
+
+                       if ((m_prop.automatic_face_movement_max_rotation_per_sec > 0) &&
+                               (fabs(m_yaw - optimal_yaw) > max_rotation_delta)) {
+
+                               m_yaw = optimal_yaw < m_yaw ? m_yaw - max_rotation_delta : m_yaw + max_rotation_delta;
+                       } else {
+                               m_yaw = optimal_yaw;
+                       }
                }
        }
 
@@ -394,7 +405,7 @@ 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);
@@ -591,6 +602,21 @@ void LuaEntitySAO::getAttachment(int *parent_id, std::string *bone, v3f *positio
        *rotation = m_attachment_rotation;
 }
 
+void LuaEntitySAO::addAttachmentChild(int child_id)
+{
+       m_attachment_child_ids.insert(child_id);
+}
+
+void LuaEntitySAO::removeAttachmentChild(int child_id)
+{
+       m_attachment_child_ids.erase(child_id);
+}
+
+std::set<int> LuaEntitySAO::getAttachmentChildIds()
+{
+       return m_attachment_child_ids;
+}
+
 ObjectProperties* LuaEntitySAO::accessObjectProperties()
 {
        return &m_prop;
@@ -743,8 +769,6 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
        m_bone_position_sent(false),
        m_attachment_parent_id(0),
        m_attachment_sent(false),
-       m_nametag_color(video::SColor(255, 255, 255, 255)),
-       m_nametag_sent(false),
        // public
        m_physics_override_speed(1),
        m_physics_override_jump(1),
@@ -807,8 +831,8 @@ void PlayerSAO::removingFromEnvironment()
        {
                m_player->setPlayerSAO(NULL);
                m_player->peer_id = 0;
-               m_env->savePlayer(m_player->getName());
-               m_env->removePlayer(m_player->getName());
+               m_env->savePlayer((RemotePlayer*)m_player);
+               m_env->removePlayer(m_player);
        }
 }
 
@@ -843,7 +867,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
                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_nametag_color)); // 6
+               os << serializeLongString(gob_cmd_update_nametag_attributes(m_prop.nametag_color)); // 6 (GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) : Deprecated, for backwards compatibility only.
        }
        else
        {
@@ -998,14 +1022,6 @@ void PlayerSAO::step(float dtime, bool send_recommended)
                ActiveObjectMessage aom(getId(), true, str);
                m_messages_out.push(aom);
        }
-
-       if (m_nametag_sent == false) {
-               m_nametag_sent = true;
-               std::string str = gob_cmd_update_nametag_attributes(m_nametag_color);
-               // create message and add to list
-               ActiveObjectMessage aom(getId(), true, str);
-               m_messages_out.push(aom);
-       }
 }
 
 void PlayerSAO::setBasePosition(const v3f &position)
@@ -1231,25 +1247,29 @@ void PlayerSAO::getAttachment(int *parent_id, std::string *bone, v3f *position,
        *rotation = m_attachment_rotation;
 }
 
-ObjectProperties* PlayerSAO::accessObjectProperties()
+void PlayerSAO::addAttachmentChild(int child_id)
 {
-       return &m_prop;
+       m_attachment_child_ids.insert(child_id);
 }
 
-void PlayerSAO::notifyObjectPropertiesModified()
+void PlayerSAO::removeAttachmentChild(int child_id)
 {
-       m_properties_sent = false;
+       m_attachment_child_ids.erase(child_id);
 }
 
-void PlayerSAO::setNametagColor(video::SColor color)
+std::set<int> PlayerSAO::getAttachmentChildIds()
 {
-       m_nametag_color = color;
-       m_nametag_sent = false;
+       return m_attachment_child_ids;
 }
 
-video::SColor PlayerSAO::getNametagColor()
+ObjectProperties* PlayerSAO::accessObjectProperties()
 {
-       return m_nametag_color;
+       return &m_prop;
+}
+
+void PlayerSAO::notifyObjectPropertiesModified()
+{
+       m_properties_sent = false;
 }
 
 Inventory* PlayerSAO::getInventory()
@@ -1367,4 +1387,3 @@ bool PlayerSAO::getCollisionBox(aabb3f *toset) {
 bool PlayerSAO::collideWithObjects(){
        return true;
 }
-