make formspec textarea wordwrap

[dragonfireclient.git] / src / localplayer.h

diff --git a/src/localplayer.h b/src/localplayer.h
index 17434d37910e2103b377afd61e47317651a1a2bc..38e7a4cd9e739ba0955dde3fbaf60f20dffe36ac 100644 (file)
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -23,7 +23,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "player.h"
 #include <list>
 
-class ClientEnvironment;
+class Environment;
+
+class ClientActiveObject;
+
+enum LocalPlayerAnimations {NO_ANIM, WALK_ANIM, DIG_ANIM, WD_ANIM};  // no local animation, walking, digging, both
 
 class LocalPlayer : public Player
 {
@@ -35,14 +39,16 @@ class LocalPlayer : public Player
        {
                return true;
        }
+       
+       ClientActiveObject *parent;
 
        bool isAttached;
 
        v3f overridePosition;
        
-       void move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
+       void move(f32 dtime, Environment *env, f32 pos_max_d);
+       void move(f32 dtime, Environment *env, f32 pos_max_d,
                        std::list<CollisionInfo> *collision_info);
-       void move(f32 dtime, ClientEnvironment *env, f32 pos_max_d);
 
        void applyControl(float dtime);
 
@@ -55,6 +61,17 @@ class LocalPlayer : public Player
        float last_yaw;
        unsigned int last_keyPressed;
 
+       float camera_impact;
+       int camera_mode;
+       v3f eye_offset_first;
+       v3f eye_offset_third;
+
+       int last_animation;
+       float last_animation_speed;
+
+       std::string hotbar_image;
+       std::string hotbar_selected_image;
+
 private:
        // This is used for determining the sneaking range
        v3s16 m_sneak_node;