diff options
| author | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-03-30 19:49:52 +0100 |
| commit | a0566270d9fa075afa36a7e3e68c690b1b23ba90 (patch) | |
| tree | 6bc88127ee67b7bf4d6a2d6f9d0a9e5f997d1dd1 /src/localplayer.h | |
| parent | 0d83bdc3aa9f1077836aacb833ac4ad9bbb9a4f4 (diff) | |
| parent | 1aa50b13622c1e264044839ecdf0152670dae6ce (diff) | |
| download | minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.gz minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.tar.bz2 minetest-a0566270d9fa075afa36a7e3e68c690b1b23ba90.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/localplayer.h')
| -rw-r--r-- | src/localplayer.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/localplayer.h b/src/localplayer.h index f372c787d..17434d379 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -21,6 +21,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #define LOCALPLAYER_HEADER #include "player.h" +#include <list> + +class ClientEnvironment; class LocalPlayer : public Player { @@ -37,9 +40,9 @@ public: v3f overridePosition; - void move(f32 dtime, Map &map, f32 pos_max_d, - core::list<CollisionInfo> *collision_info); - 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, ClientEnvironment *env, f32 pos_max_d); void applyControl(float dtime); |