X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fplayer.h;h=b317cda4fbeaf3035c102365bb2fe3f2f6b3c04b;hb=7ea4a03c835d68a6fb58aa55aa6a6315ec80b79f;hp=c112618761d50572c5cc35ca792d9077d0faa0ad;hpb=5e507c9829942c434a6f1ae7a4f3a488c7e50bef;p=dragonfireclient.git

diff --git a/src/player.h b/src/player.h
index c11261876..b317cda4f 100644
--- 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);