summaryrefslogtreecommitdiff
path: root/src/player.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/player.h')
-rw-r--r--src/player.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/player.h b/src/player.h
index 2eaeaae9a..03fba1e2c 100644
--- a/src/player.h
+++ b/src/player.h
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "common_irrlicht.h"
#include "inventory.h"
+#include "collision.h"
#define PLAYERNAME_SIZE 20
@@ -124,6 +125,8 @@ public:
bool craftresult_is_preview;
+ u16 hp;
+
u16 peer_id;
protected:
@@ -325,6 +328,8 @@ public:
return true;
}
+ 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 applyControl(float dtime);