Sapier's fix for the RESEND RELIABLE problem (#4170)

[dragonfireclient.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index c112618761d50572c5cc35ca792d9077d0faa0ad..b317cda4fbeaf3035c102365bb2fe3f2f6b3c04b 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -119,9 +119,6 @@ class Player
                m_speed = speed;
        }
 
-       void accelerateHorizontal(v3f target_speed, f32 max_increase);
-       void accelerateVertical(v3f target_speed, f32 max_increase);
-
        v3f getPosition()
        {
                return m_position;
@@ -198,7 +195,7 @@ class Player
                return m_name;
        }
 
-       core::aabbox3d<f32> getCollisionbox()
+       aabb3f getCollisionbox()
        {
                return m_collisionbox;
        }
@@ -321,6 +318,7 @@ class Player
        // Use a function, if isDead can be defined by other conditions
        bool isDead() { return hp == 0; }
 
+       bool got_teleported;
        bool touching_ground;
        // This oscillates so that the player jumps a bit above the surface
        bool in_liquid;
@@ -398,7 +396,7 @@ class Player
        f32 m_yaw;
        v3f m_speed;
        v3f m_position;
-       core::aabbox3d<f32> m_collisionbox;
+       aabb3f m_collisionbox;
 
        bool m_dirty;
 
@@ -424,10 +422,7 @@ class Player
 class RemotePlayer : public Player
 {
 public:
-       RemotePlayer(IGameDef *gamedef, const char *name):
-               Player(gamedef, name),
-               m_sao(NULL)
-       {}
+       RemotePlayer(IGameDef *gamedef, const char *name);
        virtual ~RemotePlayer() {}
 
        void save(std::string savedir);