make formspec textarea wordwrap

[dragonfireclient.git] / src / localplayer.h

diff --git a/src/localplayer.h b/src/localplayer.h
index b6a3ed1f6c8b951a5020da2a809c228b435ed8bd..38e7a4cd9e739ba0955dde3fbaf60f20dffe36ac 100644 (file)
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -23,10 +23,12 @@ 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
 {
 public:
@@ -44,9 +46,9 @@ class LocalPlayer : public Player
 
        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);
 
@@ -60,6 +62,12 @@ class LocalPlayer : public Player
        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;