Fix a memleak pointed by @Zeno- in MeshUpdateQueue
[oweals/minetest.git] / src / player.h
index 1980a86a3b9f6bda0510c7ebc49672caaede1fd8..3432069c0524a70e297b6befe85b689669d5ec02 100644 (file)
@@ -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>
 
@@ -99,9 +98,7 @@ struct PlayerControl
 };
 
 class Map;
-class IGameDef;
 struct CollisionInfo;
-class PlayerSAO;
 struct HudElement;
 class Environment;
 
@@ -131,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()
        {
@@ -185,23 +140,6 @@ public:
                return size;
        }
 
-       void setLocalAnimations(v2s32 frames[4], float frame_speed)
-       {
-               for (int i = 0; i < 4; i++)
-                       local_animations[i] = frames[i];
-               local_animation_speed = frame_speed;
-       }
-
-       void getLocalAnimations(v2s32 *frames, float *frame_speed)
-       {
-               for (int i = 0; i < 4; i++)
-                       frames[i] = local_animations[i];
-               *frame_speed = local_animation_speed;
-       }
-
-       virtual bool isLocal() const { return false; }
-
-       bool camera_barely_in_ceiling;
        v3f eye_offset_first;
        v3f eye_offset_third;
 
@@ -223,8 +161,6 @@ public:
        v2s32 local_animations[4];
        float local_animation_speed;
 
-       u16 hp;
-
        u16 peer_id;
 
        std::string inventory_formspec;
@@ -243,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:
@@ -258,152 +189,5 @@ private:
        Mutex m_mutex;
 };
 
-enum RemotePlayerChatResult {
-       RPLAYER_CHATRESULT_OK,
-       RPLAYER_CHATRESULT_FLOODING,
-       RPLAYER_CHATRESULT_KICK,
-};
-/*
-       Player on the server
-*/
-class RemotePlayer : public Player
-{
-public:
-       RemotePlayer(const char *name, IItemDefManager *idef);
-       virtual ~RemotePlayer() {}
-
-       void save(std::string savedir, IGameDef *gamedef);
-       void deSerialize(std::istream &is, const std::string &playername);
-
-       PlayerSAO *getPlayerSAO() { return m_sao; }
-       void setPlayerSAO(PlayerSAO *sao) { m_sao = sao; }
-       void setPosition(const v3f &position);
-
-       const RemotePlayerChatResult canSendChatMessage();
-
-       void setHotbarItemcount(s32 hotbar_itemcount)
-       {
-               hud_hotbar_itemcount = hotbar_itemcount;
-       }
-
-       s32 getHotbarItemcount() const { return hud_hotbar_itemcount; }
-
-       void overrideDayNightRatio(bool do_override, float ratio)
-       {
-               m_day_night_ratio_do_override = do_override;
-               m_day_night_ratio = ratio;
-       }
-
-       void getDayNightRatio(bool *do_override, float *ratio)
-       {
-               *do_override = m_day_night_ratio_do_override;
-               *ratio = m_day_night_ratio;
-       }
-
-       // Use a function, if isDead can be defined by other conditions
-       bool isDead() const { return hp == 0; }
-
-       void setHotbarImage(const std::string &name)
-       {
-               hud_hotbar_image = name;
-       }
-
-       std::string getHotbarImage() const
-       {
-               return hud_hotbar_image;
-       }
-
-       void setHotbarSelectedImage(const std::string &name)
-       {
-               hud_hotbar_selected_image = name;
-       }
-
-       const std::string &getHotbarSelectedImage() const
-       {
-               return hud_hotbar_selected_image;
-       }
-
-       // Deprecated
-       f32 getRadPitchDep() const { return -1.0 * m_pitch * core::DEGTORAD; }
-
-       // Deprecated
-       f32 getRadYawDep() const { return (m_yaw + 90.) * core::DEGTORAD; }
-
-       void setSky(const video::SColor &bgcolor, const std::string &type,
-                               const std::vector<std::string> &params)
-       {
-               m_sky_bgcolor = bgcolor;
-               m_sky_type = type;
-               m_sky_params = params;
-       }
-
-       void getSky(video::SColor *bgcolor, std::string *type,
-                               std::vector<std::string> *params)
-       {
-               *bgcolor = m_sky_bgcolor;
-               *type = m_sky_type;
-               *params = m_sky_params;
-       }
-
-       bool checkModified() const { return m_dirty || inventory.checkModified(); }
-
-       void setModified(const bool x)
-       {
-               m_dirty = x;
-               if (!x)
-                       inventory.setModified(x);
-       }
-
-       virtual void setBreath(u16 breath)
-       {
-               if (breath != m_breath)
-                       m_dirty = true;
-               Player::setBreath(breath);
-       }
-
-       virtual void setPitch(f32 pitch)
-       {
-               if (pitch != m_pitch)
-                       m_dirty = true;
-               Player::setPitch(pitch);
-       }
-
-       virtual void setYaw(f32 yaw)
-       {
-               if (yaw != m_yaw)
-                       m_dirty = true;
-               Player::setYaw(yaw);
-       }
-
-       u16 protocol_version;
-private:
-       /*
-               serialize() writes a bunch of text that can contain
-               any characters except a '\0', and such an ending that
-               deSerialize stops reading exactly at the right point.
-       */
-       void serialize(std::ostream &os);
-
-       PlayerSAO *m_sao;
-       bool m_dirty;
-
-       static bool m_setting_cache_loaded;
-       static float m_setting_chat_message_limit_per_10sec;
-       static u16 m_setting_chat_message_limit_trigger_kick;
-
-       u32 m_last_chat_message_sent;
-       float m_chat_message_allowance;
-       u16 m_message_rate_overhead;
-
-       bool m_day_night_ratio_do_override;
-       float m_day_night_ratio;
-       std::string hud_hotbar_image;
-       std::string hud_hotbar_selected_image;
-
-       std::string m_sky_type;
-       video::SColor m_sky_bgcolor;
-       std::vector<std::string> m_sky_params;
-};
-
 #endif