From 6a1670dbc31cc0e44178bbd9ad34ff0d5981a060 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <zhuravlevilya@ya.ru>
Date: Thu, 20 Dec 2012 21:19:49 +0400
Subject: Migrate to STL containers/algorithms.

---
 src/localplayer.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/localplayer.h')

diff --git a/src/localplayer.h b/src/localplayer.h
index f372c787d..e46ca6147 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define LOCALPLAYER_HEADER
 
 #include "player.h"
+#include <list>
 
 class LocalPlayer : public Player
 {
@@ -38,7 +39,7 @@ public:
 	v3f overridePosition;
 	
 	void move(f32 dtime, Map &map, f32 pos_max_d,
-			core::list<CollisionInfo> *collision_info);
+			std::list<CollisionInfo> *collision_info);
 	void move(f32 dtime, Map &map, f32 pos_max_d);
 
 	void applyControl(float dtime);
-- 
cgit v1.2.3


From 8800896824d609c754eee38d3720a112f4216e57 Mon Sep 17 00:00:00 2001
From: sapier <Sapier at GMX dot net>
Date: Sat, 12 Jan 2013 17:59:19 +0000
Subject: Closed add object <-> object collision handling

---
 src/localplayer.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/localplayer.h')

diff --git a/src/localplayer.h b/src/localplayer.h
index e46ca6147..17434d379 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -23,6 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "player.h"
 #include <list>
 
+class ClientEnvironment;
+
 class LocalPlayer : public Player
 {
 public:
@@ -38,9 +40,9 @@ public:
 
 	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);
 
-- 
cgit v1.2.3