Fix a memleak pointed by @Zeno- in MeshUpdateQueue

[oweals/minetest.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index 6ac5dfe65ba4e53ef38929b9d46915ab346a2deb..3432069c0524a70e297b6befe85b689669d5ec02 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "irrlichttypes_bloated.h"
 #include "inventory.h"
-#include "constants.h" // BS
 #include "threading/mutex.h"
 #include <list>
 
@@ -129,49 +128,7 @@ public:
                m_speed = speed;
        }
 
-       v3f getPosition()
-       {
-               return m_position;
-       }
-
-       v3s16 getLightPosition() const;
-
-       v3f getEyeOffset()
-       {
-               float eye_height = camera_barely_in_ceiling ? 1.5f : 1.625f;
-               return v3f(0, BS * eye_height, 0);
-       }
-
-       v3f getEyePosition()
-       {
-               return m_position + getEyeOffset();
-       }
-
-       virtual void setPosition(const v3f &position)
-       {
-               m_position = position;
-       }
-
-       virtual void setPitch(f32 pitch)
-       {
-               m_pitch = pitch;
-       }
-
-       virtual void setYaw(f32 yaw)
-       {
-               m_yaw = yaw;
-       }
-
-       f32 getPitch() const { return m_pitch; }
-       f32 getYaw() const { return m_yaw; }
-       u16 getBreath() const { return m_breath; }
-
-       virtual void setBreath(u16 breath) { m_breath = breath; }
-
-       f32 getRadPitch() const { return m_pitch * core::DEGTORAD; }
-       f32 getRadYaw() const { return m_yaw * core::DEGTORAD; }
        const char *getName() const { return m_name; }
-       aabb3f getCollisionbox() const { return m_collisionbox; }
 
        u32 getFreeHudID()
        {
@@ -183,7 +140,6 @@ public:
                return size;
        }
 
-       bool camera_barely_in_ceiling;
        v3f eye_offset_first;
        v3f eye_offset_third;
 
@@ -205,8 +161,6 @@ public:
        v2s32 local_animations[4];
        float local_animation_speed;
 
-       u16 hp;
-
        u16 peer_id;
 
        std::string inventory_formspec;
@@ -225,12 +179,7 @@ public:
        s32 hud_hotbar_itemcount;
 protected:
        char m_name[PLAYERNAME_SIZE];
-       u16 m_breath;
-       f32 m_pitch;
-       f32 m_yaw;
        v3f m_speed;
-       v3f m_position;
-       aabb3f m_collisionbox;
 
        std::vector<HudElement *> hud;
 private: