Add sqlite3 backend hack for android

[oweals/minetest.git] / src / localplayer.h

diff --git a/src/localplayer.h b/src/localplayer.h
index e46ca6147cd5d2152a51509fa13ece6fa08796e0..bfe476b70360068e64e74c1d26066ce963819048 100644 (file)
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -23,6 +23,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "player.h"
 #include <list>
 
+class Environment;
+class GenericCAO;
+class ClientActiveObject;
+
+enum LocalPlayerAnimations {NO_ANIM, WALK_ANIM, DIG_ANIM, WD_ANIM};  // no local animation, walking, digging, both
+
 class LocalPlayer : public Player
 {
 public:
@@ -33,14 +39,16 @@ public:
        {
                return true;
        }
+       
+       ClientActiveObject *parent;
 
        bool isAttached;
 
        v3f overridePosition;
        
-       void move(f32 dtime, Map &map, 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, Map &map, f32 pos_max_d);
 
        void applyControl(float dtime);
 
@@ -53,6 +61,25 @@ public:
        float last_yaw;
        unsigned int last_keyPressed;
 
+       float camera_impact;
+       v3f eye_offset_first;
+       v3f eye_offset_third;
+
+       int last_animation;
+       float last_animation_speed;
+
+       std::string hotbar_image;
+       std::string hotbar_selected_image;
+
+       GenericCAO* getCAO() const {
+               return m_cao;
+       }
+
+       void setCAO(GenericCAO* toset) {
+               assert( m_cao == NULL );
+               m_cao = toset;
+       }
+
 private:
        // This is used for determining the sneaking range
        v3s16 m_sneak_node;
@@ -65,6 +92,8 @@ private:
        // Whether recalculation of the sneak node is needed
        bool m_need_to_get_new_sneak_node;
        bool m_can_jump;
+
+       GenericCAO* m_cao;
 };
 
 #endif