X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Flocalplayer.h;h=8c3041c04b4ac40172baa7ddf0dd204299eeb5cb;hb=c824abd7b2e199d9c7e3dcc2839a28275f4120f2;hp=e46ca6147cd5d2152a51509fa13ece6fa08796e0;hpb=6a1670dbc31cc0e44178bbd9ad34ff0d5981a060;p=oweals%2Fminetest.git

diff --git a/src/localplayer.h b/src/localplayer.h
index e46ca6147..8c3041c04 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -23,6 +23,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "player.h"
 #include <list>
 
+class ClientEnvironment;
+
+class ClientActiveObject;
+
 class LocalPlayer : public Player
 {
 public:
@@ -33,14 +37,16 @@ public:
 	{
 		return true;
 	}
+	
+	ClientActiveObject *parent;
 
 	bool isAttached;
 
 	v3f overridePosition;
 	
-	void move(f32 dtime, Map &map, f32 pos_max_d,
+	void move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
 			std::list<CollisionInfo> *collision_info);
-	void move(f32 dtime, Map &map, f32 pos_max_d);
+	void move(f32 dtime, ClientEnvironment *env, f32 pos_max_d);
 
 	void applyControl(float dtime);
 
@@ -53,6 +59,8 @@ public:
 	float last_yaw;
 	unsigned int last_keyPressed;
 
+	float camera_impact;
+
 private:
 	// This is used for determining the sneaking range
 	v3s16 m_sneak_node;