Environment cleanup

[dragonfireclient.git] / src / localplayer.h

diff --git a/src/localplayer.h b/src/localplayer.h
index 3ae0c4e51d29566ffa04af1e19638df7598767f4..eb727d7e3452da2c080939c993dae7ca86b9147b 100644 (file)
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -21,28 +21,42 @@ 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 *gamedef, const char *name);
        virtual ~LocalPlayer();
 
-       bool isLocal() const
-       {
-               return true;
-       }
-
        ClientActiveObject *parent;
 
+       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;
 
@@ -71,6 +85,9 @@ class LocalPlayer : public Player
 
        video::SColor light_color;
 
+       float hurt_tilt_timer;
+       float hurt_tilt_strength;
+
        GenericCAO* getCAO() const {
                return m_cao;
        }
@@ -80,6 +97,8 @@ class LocalPlayer : public Player
                m_cao = toset;
        }
 
+       u32 maxHudId() const { return hud.size(); }
+
 private:
        void accelerateHorizontal(const v3f &target_speed, const f32 max_increase);
        void accelerateVertical(const v3f &target_speed, const f32 max_increase);
@@ -100,6 +119,7 @@ class LocalPlayer : public Player
        bool m_can_jump;
 
        GenericCAO* m_cao;
+       Client *m_gamedef;
 };
 
 #endif