Modernize client code (#6250)

[oweals/minetest.git] / src / content_sao.cpp

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 90d830ce3edb65ec37dbe5cb91e67f9ee6d78f6c..674ab580c389cea7490a9999e0cebbec866dc123 100644 (file)
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -91,6 +91,9 @@ public:
        }
 
        bool getCollisionBox(aabb3f *toset) const { return false; }
+
+       virtual bool getSelectionBox(aabb3f *toset) const { return false; }
+
        bool collideWithObjects() const { return false; }
 
 private:
@@ -106,19 +109,7 @@ TestSAO proto_TestSAO(NULL, v3f(0,0,0));
  */
 
 UnitSAO::UnitSAO(ServerEnvironment *env, v3f pos):
-       ServerActiveObject(env, pos),
-       m_hp(-1),
-       m_yaw(0),
-       m_properties_sent(true),
-       m_armor_groups_sent(false),
-       m_animation_range(0,0),
-       m_animation_speed(0),
-       m_animation_blend(0),
-       m_animation_loop(true),
-       m_animation_sent(false),
-       m_bone_position_sent(false),
-       m_attachment_parent_id(0),
-       m_attachment_sent(false)
+       ServerActiveObject(env, pos)
 {
        // Initialize something to armor groups
        m_armor_groups["fleshy"] = 100;
@@ -239,16 +230,7 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
                const std::string &name, const std::string &state):
        UnitSAO(env, pos),
        m_init_name(name),
-       m_init_state(state),
-       m_registered(false),
-       m_velocity(0,0,0),
-       m_acceleration(0,0,0),
-       m_last_sent_yaw(0),
-       m_last_sent_position(0,0,0),
-       m_last_sent_velocity(0,0,0),
-       m_last_sent_position_timer(0),
-       m_last_sent_move_precision(0),
-       m_current_texture_modifier("")
+       m_init_state(state)
 {
        // Only register type if no environment supplied
        if(env == NULL){
@@ -600,8 +582,10 @@ int LuaEntitySAO::punch(v3f dir,
                }
        }
 
-       if (getHP() == 0)
+       if (getHP() == 0) {
                m_removed = true;
+               m_env->getScriptIface()->luaentity_on_death(m_id, puncher);
+       }
 
 
 
@@ -767,6 +751,18 @@ bool LuaEntitySAO::getCollisionBox(aabb3f *toset) const
        return false;
 }
 
+bool LuaEntitySAO::getSelectionBox(aabb3f *toset) const
+{
+       if (!m_prop.is_visible) {
+               return false;
+       }
+
+       toset->MinEdge = m_prop.collisionbox.MinEdge * BS;
+       toset->MaxEdge = m_prop.collisionbox.MaxEdge * BS;
+
+       return true;
+}
+
 bool LuaEntitySAO::collideWithObjects() const
 {
        return m_prop.collideWithObjects;
@@ -783,36 +779,14 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id
        UnitSAO(env_, v3f(0,0,0)),
        m_player(player_),
        m_peer_id(peer_id_),
-       m_inventory(NULL),
-       m_damage(0),
-       m_last_good_position(0,0,0),
-       m_time_from_last_teleport(0),
-       m_time_from_last_punch(0),
-       m_nocheat_dig_pos(32767, 32767, 32767),
-       m_nocheat_dig_time(0),
-       m_wield_index(0),
-       m_position_not_sent(false),
-       m_is_singleplayer(is_singleplayer),
-       m_breath(PLAYER_MAX_BREATH),
-       m_pitch(0),
-       m_fov(0),
-       m_wanted_range(0),
-       m_extended_attributes_modified(false),
-       // public
-       m_physics_override_speed(1),
-       m_physics_override_jump(1),
-       m_physics_override_gravity(1),
-       m_physics_override_sneak(true),
-       m_physics_override_sneak_glitch(false),
-       m_physics_override_new_move(true),
-       m_physics_override_sent(false)
+       m_is_singleplayer(is_singleplayer)
 {
        assert(m_peer_id != 0); // pre-condition
 
        m_prop.hp_max = PLAYER_MAX_HP;
        m_prop.physical = false;
        m_prop.weight = 75;
-       m_prop.collisionbox = aabb3f(-0.3f, -1.0f, -0.3f, 0.3f, 0.75f, 0.3f);
+       m_prop.collisionbox = aabb3f(-0.3f, 0.0f, -0.3f, 0.3f, 1.77f, 0.3f);
        // start of default appearance, this should be overwritten by LUA
        m_prop.visual = "upright_sprite";
        m_prop.visual_size = v2f(1, 2);
@@ -825,6 +799,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id
        // end of default appearance
        m_prop.is_visible = true;
        m_prop.makes_footstep_sound = true;
+       m_prop.stepheight = PLAYER_DEFAULT_STEPHEIGHT * BS;
        m_hp = PLAYER_MAX_HP;
 }
 
@@ -884,7 +859,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
        os << serializeString(m_player->getName()); // name
        writeU8(os, 1); // is_player
        writeS16(os, getId()); //id
-       writeV3F1000(os, m_base_position + v3f(0,BS*1,0));
+       writeV3F1000(os, m_base_position);
        writeF1000(os, m_yaw);
        writeS16(os, getHP());
 
@@ -1037,7 +1012,7 @@ void PlayerSAO::step(float dtime, bool send_recommended)
                if(isAttached()) // Just in case we ever do send attachment position too
                        pos = m_env->getActiveObject(m_attachment_parent_id)->getBasePosition();
                else
-                       pos = m_base_position + v3f(0,BS*1,0);
+                       pos = m_base_position;
                std::string str = gob_cmd_update_position(
                        pos,
                        v3f(0,0,0),
@@ -1442,9 +1417,22 @@ bool PlayerSAO::checkMovementCheat()
 
 bool PlayerSAO::getCollisionBox(aabb3f *toset) const
 {
-       *toset = aabb3f(-0.3f * BS, 0.0f, -0.3f * BS, 0.3f * BS, 1.75f * BS, 0.3f * BS);
+       //update collision box
+       toset->MinEdge = m_prop.collisionbox.MinEdge * BS;
+       toset->MaxEdge = m_prop.collisionbox.MaxEdge * BS;
 
        toset->MinEdge += m_base_position;
        toset->MaxEdge += m_base_position;
        return true;
 }
+
+bool PlayerSAO::getSelectionBox(aabb3f *toset) const
+{
+       if (!m_prop.is_visible) {
+               return false;
+       }
+
+       getCollisionBox(toset);
+
+       return true;
+}