Dungeongen: Fix out-of-voxelmanip access segfault

[minetest.git] / src / localplayer.h

diff --git a/src/localplayer.h b/src/localplayer.h
index 40a7f089edf6ab1112a96ba9452d7e507b7b11ad..685a78cb39612960c9caf5f71d5f8ca51c71c11c 100644 (file)
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -21,31 +21,46 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define LOCALPLAYER_HEADER
 
 #include "player.h"
+#include "environment.h"
 #include <list>
 
+class Client;
 class Environment;
 class GenericCAO;
 class ClientActiveObject;
+class IGameDef;
 
 enum LocalPlayerAnimations {NO_ANIM, WALK_ANIM, DIG_ANIM, WD_ANIM};  // no local animation, walking, digging, both
 
 class LocalPlayer : public Player
 {
 public:
-       LocalPlayer(IGameDef *gamedef, const char *name);
+       LocalPlayer(Client *client, const char *name);
        virtual ~LocalPlayer();
 
-       bool isLocal() const
-       {
-               return true;
-       }
-
        ClientActiveObject *parent;
 
+       u16 hp;
+       bool got_teleported;
        bool isAttached;
+       bool touching_ground;
+       // This oscillates so that the player jumps a bit above the surface
+       bool in_liquid;
+       // This is more stable and defines the maximum speed of the player
+       bool in_liquid_stable;
+       // Gets the viscosity of water to calculate friction
+       u8 liquid_viscosity;
+       bool is_climbing;
+       bool swimming_vertical;
+
+       float physics_override_speed;
+       float physics_override_jump;
+       float physics_override_gravity;
+       bool physics_override_sneak;
+       bool physics_override_sneak_glitch;
 
        v3f overridePosition;
-       
+
        void move(f32 dtime, Environment *env, f32 pos_max_d);
        void move(f32 dtime, Environment *env, f32 pos_max_d,
                        std::vector<CollisionInfo> *collision_info);
@@ -60,6 +75,8 @@ class LocalPlayer : public Player
        float last_pitch;
        float last_yaw;
        unsigned int last_keyPressed;
+       u8 last_camera_fov;
+       u8 last_wanted_range;
 
        float camera_impact;
 
@@ -71,6 +88,9 @@ class LocalPlayer : public Player
 
        video::SColor light_color;
 
+       float hurt_tilt_timer;
+       float hurt_tilt_strength;
+
        GenericCAO* getCAO() const {
                return m_cao;
        }
@@ -80,7 +100,40 @@ class LocalPlayer : public Player
                m_cao = toset;
        }
 
+       u32 maxHudId() const { return hud.size(); }
+
+       u16 getBreath() const { return m_breath; }
+       void setBreath(u16 breath) { m_breath = breath; }
+
+       v3s16 getLightPosition() const;
+
+       void setYaw(f32 yaw)
+       {
+               m_yaw = yaw;
+       }
+
+       f32 getYaw() const { return m_yaw; }
+
+       void setPitch(f32 pitch)
+       {
+               m_pitch = pitch;
+       }
+
+       f32 getPitch() const { return m_pitch; }
+
+       void setPosition(const v3f &position)
+       {
+               m_position = position;
+       }
+
+       v3f getPosition() const { return m_position; }
+       v3f getEyePosition() const { return m_position + getEyeOffset(); }
+       v3f getEyeOffset() const;
 private:
+       void accelerateHorizontal(const v3f &target_speed, const f32 max_increase);
+       void accelerateVertical(const v3f &target_speed, const f32 max_increase);
+
+       v3f m_position;
        // This is used for determining the sneaking range
        v3s16 m_sneak_node;
        // Whether the player is allowed to sneak
@@ -95,8 +148,14 @@ class LocalPlayer : public Player
        v3s16 m_old_node_below;
        std::string m_old_node_below_type;
        bool m_can_jump;
+       u16 m_breath;
+       f32 m_yaw;
+       f32 m_pitch;
+       bool camera_barely_in_ceiling;
+       aabb3f m_collisionbox;
 
        GenericCAO* m_cao;
+       Client *m_client;
 };
 
 #endif