Move tool stuff to tool.{h,cpp}

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

diff --git a/src/player.h b/src/player.h
index 78ca149488370fe0424c3f0e237acad9367792a0..e6dfb81991450569753ae626942243dac677e388 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -62,7 +62,25 @@ public:
                return m_position;
        }
 
-       virtual void setPosition(v3f position)
+       v3s16 getLightPosition() const
+       {
+               return floatToInt(m_position + v3f(0,BS+BS/2,0), BS);
+       }
+
+       v3f getEyeOffset()
+       {
+               // This is at the height of the eyes of the current figure
+               // return v3f(0, BS+BS/2, 0);
+               // This is more like in minecraft
+               return v3f(0,BS+(5*BS)/8,0);
+       }
+
+       v3f getEyePosition()
+       {
+               return m_position + getEyeOffset();
+       }
+
+       virtual void setPosition(const v3f &position)
        {
                m_position = position;
        }
@@ -92,6 +110,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;
@@ -99,7 +126,10 @@ public:
 
        virtual bool isLocal() const = 0;
 
-       virtual void updateLight(u8 light_at_pos) {};
+       virtual void updateLight(u8 light_at_pos)
+       {
+               light = light_at_pos;
+       }
        
        // NOTE: Use peer_id == 0 for disconnected
        /*virtual bool isClientConnected() { return false; }
@@ -121,6 +151,8 @@ public:
        bool is_climbing;
        bool swimming_up;
        
+       u8 light;
+
        Inventory inventory;
        // Actual inventory is backed up here when creative mode is used
        Inventory *inventory_backup;
@@ -133,6 +165,7 @@ public:
 
 protected:
        char m_name[PLAYERNAME_SIZE];
+       u16 m_selected_item;
        f32 m_pitch;
        f32 m_yaw;
        v3f m_speed;
@@ -146,11 +179,23 @@ public:
        Player on the server
 */
 
-class ServerRemotePlayer : public Player
+#include "serverobject.h"
+#include "content_object.h" // Object type IDs
+
+class ServerRemotePlayer : public Player, public ServerActiveObject
 {
 public:
-       ServerRemotePlayer()
+       ServerRemotePlayer():
+               ServerActiveObject(NULL, v3f(0,0,0))
+       {
+       }
+       ServerRemotePlayer(ServerEnvironment *env, v3f pos_, u16 peer_id_,
+                       const char *name_):
+               ServerActiveObject(env, pos_)
        {
+               setPosition(pos_);
+               peer_id = peer_id_;
+               updateName(name_);
        }
        virtual ~ServerRemotePlayer()
        {
@@ -165,6 +210,25 @@ public:
        {
        }
        
+       virtual void setPosition(const v3f &position)
+       {
+               Player::setPosition(position);
+               ServerActiveObject::setBasePosition(position);
+       }
+       
+       /* ServerActiveObject interface */
+
+       u8 getType() const
+               {return ACTIVEOBJECT_TYPE_PLAYER;}
+       virtual std::string getDescription(){return getName();}
+       // Returns a reference
+       virtual InventoryItem* getWieldedItem();
+       virtual void damageWieldedItem(u16 amount);
+       // If all fits, eats item and returns true. Otherwise returns false.
+       virtual bool addToInventory(InventoryItem *item);
+       virtual void setHP(s16 hp_);
+       virtual s16 getHP();
+
 private:
 };
 
@@ -206,7 +270,7 @@ public:
                return m_box;
        }
 
-       void setPosition(v3f position)
+       void setPosition(const v3f &position)
        {
                m_oldpos = m_showpos;
                
@@ -237,25 +301,14 @@ public:
 
        virtual void updateLight(u8 light_at_pos)
        {
+               Player::updateLight(light_at_pos);
+
                if(m_node == NULL)
                        return;
 
                u8 li = decode_light(light_at_pos);
                video::SColor color(255,li,li,li);
-
-               scene::IMesh *mesh = m_node->getMesh();
-               
-               u16 mc = mesh->getMeshBufferCount();
-               for(u16 j=0; j<mc; j++)
-               {
-                       scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
-                       video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices();
-                       u16 vc = buf->getVertexCount();
-                       for(u16 i=0; i<vc; i++)
-                       {
-                               vertices[i].Color = color;
-                       }
-               }
+               setMeshVerticesColor(m_node->getMesh(), color);
        }
        
        void move(f32 dtime, Map &map, f32 pos_max_d);
@@ -332,7 +385,7 @@ 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);