From c638442e78b953556e7dadd4c0c34cb0c719bbc8 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Thu, 21 Apr 2011 19:35:17 +0300 Subject: Some work-in-progress in hp and mobs and a frightening amount of random fixes. --- src/player.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/player.h') 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 *collision_info); void move(f32 dtime, Map &map, f32 pos_max_d); void applyControl(float dtime); -- cgit v1.2.3