X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fplayer.h;h=93197d374a5ecff3573e2c3d2d115024fcdae503;hb=8852333eb3042580592ade478e5def20f8ed5d4c;hp=60645a60f55f9a1329dc4f3b4c5e146d8638ee54;hpb=280946ba836cde9516f9344f47561f3356bdf869;p=oweals%2Fminetest.git diff --git a/src/player.h b/src/player.h index 60645a60f..93197d374 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 #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 *collision_info) {} v3f getSpeed() @@ -160,6 +165,16 @@ public: return m_yaw; } + u16 getBreath() + { + return m_breath; + } + + virtual void setBreath(u16 breath) + { + m_breath = breath; + } + f32 getRadPitch() { return -1.0 * m_pitch * core::DEGTORAD; @@ -184,6 +199,15 @@ public: return m_collisionbox; } + u32 getFreeHudID() const { + size_t size = hud.size(); + for (size_t i = 0; i != size; i++) { + if (!hud[i]) + return i; + } + return size; + } + virtual bool isLocal() const { return false; } virtual PlayerSAO *getPlayerSAO() @@ -247,15 +271,19 @@ public: float physics_override_speed; float physics_override_jump; float physics_override_gravity; + bool physics_override_sneak; + bool physics_override_sneak_glitch; + + v2s32 local_animations[4]; + float local_animation_speed; u16 hp; - u16 breath; float hurt_tilt_timer; float hurt_tilt_strength; u16 peer_id; - + std::string inventory_formspec; PlayerControl control; @@ -266,14 +294,22 @@ public: u32 keyPressed; - std::vector hud; + + HudElement* getHud(u32 id); + u32 addHud(HudElement* hud); + HudElement* removeHud(u32 id); + void clearHud(); + u32 maxHudId() { + return hud.size(); + } + u32 hud_flags; s32 hud_hotbar_itemcount; - protected: IGameDef *m_gamedef; char m_name[PLAYERNAME_SIZE]; + u16 m_breath; f32 m_pitch; f32 m_yaw; v3f m_speed; @@ -285,6 +321,8 @@ protected: v3f m_last_pos; u16 m_last_hp; Inventory m_last_inventory; + + std::vector hud; }; @@ -297,6 +335,8 @@ public: RemotePlayer(IGameDef *gamedef): Player(gamedef), m_sao(0) {} virtual ~RemotePlayer() {} + void save(std::string savedir); + PlayerSAO *getPlayerSAO() { return m_sao; } void setPlayerSAO(PlayerSAO *sao)