Falling sand and gravel

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

diff --git a/src/player.h b/src/player.h
index ce1001992fda971a02e2e565a7253f7a229d6978..56bb5083cce17adb84ed678e0b167689f6689d80 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -30,13 +30,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 
 class Map;
+class IGameDef;
 
 class Player
 {
 public:
 
-
-       Player();
+       Player(IGameDef *gamedef);
        virtual ~Player();
 
        void resetInventory();
@@ -62,10 +62,7 @@ public:
                return m_position;
        }
 
-       v3s16 getLightPosition() const
-       {
-               return floatToInt(m_position + v3f(0,BS+BS/2,0), BS);
-       }
+       v3s16 getLightPosition() const;
 
        v3f getEyeOffset()
        {
@@ -150,7 +147,6 @@ public:
        bool in_water_stable;
        bool is_climbing;
        bool swimming_up;
-       bool is_frozen;
        
        u8 light;
 
@@ -165,6 +161,8 @@ public:
        u16 peer_id;
 
 protected:
+       IGameDef *m_gamedef;
+
        char m_name[PLAYERNAME_SIZE];
        u16 m_selected_item;
        f32 m_pitch;
@@ -180,25 +178,45 @@ 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(ServerEnvironment *env);
+       ServerRemotePlayer(ServerEnvironment *env, v3f pos_, u16 peer_id_,
+                       const char *name_);
+
        virtual ~ServerRemotePlayer()
-       {
-       }
+       {}
 
        virtual bool isLocal() const
-       {
-               return false;
-       }
+       { return false; }
 
        virtual void move(f32 dtime, Map &map, f32 pos_max_d)
        {
        }
        
+       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:
 };
 
@@ -212,6 +230,7 @@ class RemotePlayer : public Player, public scene::ISceneNode
 {
 public:
        RemotePlayer(
+               IGameDef *gamedef,
                scene::ISceneNode* parent=NULL,
                IrrlichtDevice *device=NULL,
                s32 id=0);
@@ -348,7 +367,7 @@ struct PlayerControl
 class LocalPlayer : public Player
 {
 public:
-       LocalPlayer();
+       LocalPlayer(IGameDef *gamedef);
        virtual ~LocalPlayer();
 
        bool isLocal() const