summaryrefslogtreecommitdiff
path: root/src/player.h
diff options
context:
space:
mode:
authorSfan5 <sfan5@live.de>2014-04-15 19:49:32 +0200
committerSfan5 <sfan5@live.de>2014-04-15 21:34:53 +0200
commit118e2ae865bd7a0020586ef72d05bf14d66f4eae (patch)
tree5da3d9bc1d4e26e7e75f61b5ea10916161f29cba /src/player.h
parentd436502fa499255236350fc9204f9c508414704e (diff)
downloadminetest-118e2ae865bd7a0020586ef72d05bf14d66f4eae.tar.gz
minetest-118e2ae865bd7a0020586ef72d05bf14d66f4eae.tar.bz2
minetest-118e2ae865bd7a0020586ef72d05bf14d66f4eae.zip
Fix all warnings reported by clang
Diffstat (limited to 'src/player.h')
-rw-r--r--src/player.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/player.h b/src/player.h
index dce167438..4c5939d3d 100644
--- a/src/player.h
+++ b/src/player.h
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "irrlichttypes_bloated.h"
#include "inventory.h"
#include "constants.h" // BS
+#include <list>
#define PLAYERNAME_SIZE 20
@@ -88,6 +89,7 @@ class IGameDef;
struct CollisionInfo;
class PlayerSAO;
struct HudElement;
+class Environment;
class Player
{
@@ -96,7 +98,10 @@ public:
Player(IGameDef *gamedef);
virtual ~Player() = 0;
- virtual void move(f32 dtime, Map &map, f32 pos_max_d)
+ virtual void move(f32 dtime, Environment *env, f32 pos_max_d)
+ {}
+ virtual void move(f32 dtime, Environment *env, f32 pos_max_d,
+ std::list<CollisionInfo> *collision_info)
{}
v3f getSpeed()