Commented out debug statements again

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

diff --git a/src/player.h b/src/player.h
index 710a9e0ed7c61bffc17385e4e1b869bcce3b45e7..13cffa205a6986f802b77d0bd2fac2f7f486badd 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -1,6 +1,6 @@
 /*
 Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,25 +17,25 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-/*
-(c) 2010 Perttu Ahola <celeron55@gmail.com>
-*/
-
 #ifndef PLAYER_HEADER
 #define PLAYER_HEADER
 
 #include "common_irrlicht.h"
 #include "inventory.h"
+#include "collision.h"
 
 #define PLAYERNAME_SIZE 20
 
-#define PLAYERNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,"
+#define PLAYERNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_"
+
 
 class Map;
 
 class Player
 {
 public:
+
+
        Player();
        virtual ~Player();
 
@@ -62,7 +62,20 @@ public:
                return m_position;
        }
 
-       virtual void setPosition(v3f position)
+       v3s16 getLightPosition() const
+       {
+               return floatToInt(m_position + v3f(0,BS+BS/2,0), BS);
+       }
+
+       v3f getEyePosition()
+       {
+               // This is at the height of the eyes of the current figure
+               // return m_position + v3f(0, BS+BS/2, 0);
+               // This is more like in minecraft
+               return m_position + v3f(0,BS+(5*BS)/8,0);
+       }
+
+       virtual void setPosition(const v3f &position)
        {
                m_position = position;
        }
@@ -92,6 +105,15 @@ public:
                snprintf(m_name, PLAYERNAME_SIZE, "%s", name);
        }
 
+       virtual void wieldItem(u16 item);
+       virtual const InventoryItem *getWieldItem() const
+       {
+               const InventoryList *list = inventory.getList("main");
+               if (list)
+                       return list->getItem(m_selected_item);
+               return NULL;
+       }
+
        const char * getName()
        {
                return m_name;
@@ -118,18 +140,30 @@ public:
        bool in_water;
        // This is more stable and defines the maximum speed of the player
        bool in_water_stable;
+       bool is_climbing;
        bool swimming_up;
+       bool is_frozen;
        
        Inventory inventory;
+       // Actual inventory is backed up here when creative mode is used
+       Inventory *inventory_backup;
+
+       bool craftresult_is_preview;
+
+       u16 hp;
 
        u16 peer_id;
 
 protected:
        char m_name[PLAYERNAME_SIZE];
+       u16 m_selected_item;
        f32 m_pitch;
        f32 m_yaw;
        v3f m_speed;
        v3f m_position;
+
+public:
+
 };
 
 /*
@@ -196,7 +230,7 @@ public:
                return m_box;
        }
 
-       void setPosition(v3f position)
+       void setPosition(const v3f &position)
        {
                m_oldpos = m_showpos;
                
@@ -323,6 +357,8 @@ public:
                return true;
        }
 
+       void move(f32 dtime, Map &map, f32 pos_max_d,
+                       core::list<CollisionInfo> *collision_info);
        void move(f32 dtime, Map &map, f32 pos_max_d);
 
        void applyControl(float dtime);