diff options
| author | sapier <Sapier at GMX dot net> | 2013-01-12 17:59:19 +0000 |
|---|---|---|
| committer | PilzAdam <pilzadam@minetest.net> | 2013-03-28 00:09:24 +0100 |
| commit | 8800896824d609c754eee38d3720a112f4216e57 (patch) | |
| tree | 31e0be737fa3883acb1559ab5e6ada7e35ba20fb /src/localplayer.h | |
| parent | 880d9e53c39af1a7ca8b9ee5a9146708dabd5315 (diff) | |
| download | minetest-8800896824d609c754eee38d3720a112f4216e57.tar.gz minetest-8800896824d609c754eee38d3720a112f4216e57.tar.bz2 minetest-8800896824d609c754eee38d3720a112f4216e57.zip | |
Closed add object <-> object collision handling
Diffstat (limited to 'src/localplayer.h')
| -rw-r--r-- | src/localplayer.h | 6 |
1 files changed, 4 insertions, 2 deletions
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); |