Falling sand and gravel

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

diff --git a/src/player.h b/src/player.h
index d6147b2082bf108deafe7fa824d6e441825e9f59..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()
        {
@@ -141,7 +138,7 @@ public:
                deSerialize stops reading exactly at the right point.
        */
        void serialize(std::ostream &os);
-       void deSerialize(std::istream &is, IGameDef *gamedef);
+       void deSerialize(std::istream &is);
 
        bool touching_ground;
        // This oscillates so that the player jumps a bit above the surface
@@ -164,6 +161,8 @@ public:
        u16 peer_id;
 
 protected:
+       IGameDef *m_gamedef;
+
        char m_name[PLAYERNAME_SIZE];
        u16 m_selected_item;
        f32 m_pitch;
@@ -185,26 +184,15 @@ public:
 class ServerRemotePlayer : public Player, public ServerActiveObject
 {
 public:
-       ServerRemotePlayer(ServerEnvironment *env):
-               ServerActiveObject(env, v3f(0,0,0))
-       {
-       }
+       ServerRemotePlayer(ServerEnvironment *env);
        ServerRemotePlayer(ServerEnvironment *env, v3f pos_, u16 peer_id_,
-                       const char *name_):
-               ServerActiveObject(env, pos_)
-       {
-               setPosition(pos_);
-               peer_id = peer_id_;
-               updateName(name_);
-       }
+                       const char *name_);
+
        virtual ~ServerRemotePlayer()
-       {
-       }
+       {}
 
        virtual bool isLocal() const
-       {
-               return false;
-       }
+       { return false; }
 
        virtual void move(f32 dtime, Map &map, f32 pos_max_d)
        {
@@ -242,6 +230,7 @@ class RemotePlayer : public Player, public scene::ISceneNode
 {
 public:
        RemotePlayer(
+               IGameDef *gamedef,
                scene::ISceneNode* parent=NULL,
                IrrlichtDevice *device=NULL,
                s32 id=0);
@@ -378,7 +367,7 @@ struct PlayerControl
 class LocalPlayer : public Player
 {
 public:
-       LocalPlayer();
+       LocalPlayer(IGameDef *gamedef);
        virtual ~LocalPlayer();
 
        bool isLocal() const