Fix bug when craft input isn't replaced

[dragonfireclient.git] / src / localplayer.h

diff --git a/src/localplayer.h b/src/localplayer.h
index bfe476b70360068e64e74c1d26066ce963819048..b71253275a7d13fec6dd1272265c957fea0d0cc5 100644 (file)
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -32,14 +32,14 @@ enum LocalPlayerAnimations {NO_ANIM, WALK_ANIM, DIG_ANIM, WD_ANIM};  // no local
 class LocalPlayer : public Player
 {
 public:
-       LocalPlayer(IGameDef *gamedef);
+       LocalPlayer(IGameDef *gamedef, const char *name);
        virtual ~LocalPlayer();
 
        bool isLocal() const
        {
                return true;
        }
-       
+
        ClientActiveObject *parent;
 
        bool isAttached;
@@ -48,7 +48,7 @@ class LocalPlayer : public Player
        
        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);
+                       std::vector<CollisionInfo> *collision_info);
 
        void applyControl(float dtime);
 
@@ -62,8 +62,6 @@ class LocalPlayer : public Player
        unsigned int last_keyPressed;
 
        float camera_impact;
-       v3f eye_offset_first;
-       v3f eye_offset_third;
 
        int last_animation;
        float last_animation_speed;
@@ -71,12 +69,14 @@ class LocalPlayer : public Player
        std::string hotbar_image;
        std::string hotbar_selected_image;
 
+       video::SColor light_color;
+
        GenericCAO* getCAO() const {
                return m_cao;
        }
 
        void setCAO(GenericCAO* toset) {
-               assert( m_cao == NULL );
+               assert( m_cao == NULL ); // Pre-condition
                m_cao = toset;
        }