diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-04-21 19:35:17 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-04-21 19:35:17 +0300 |
| commit | c638442e78b953556e7dadd4c0c34cb0c719bbc8 (patch) | |
| tree | a7c623944ba26d64c4fbf3218025d8ec0145d849 /src/player.h | |
| parent | 3c61d57f6d7f627b32b4a8c2f461a8e01e7ac378 (diff) | |
| download | minetest-c638442e78b953556e7dadd4c0c34cb0c719bbc8.tar.gz minetest-c638442e78b953556e7dadd4c0c34cb0c719bbc8.tar.bz2 minetest-c638442e78b953556e7dadd4c0c34cb0c719bbc8.zip | |
Some work-in-progress in hp and mobs and a frightening amount of random fixes.
Diffstat (limited to 'src/player.h')
| -rw-r--r-- | src/player.h | 5 |
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); |