dofile error reporting for syntax errors

[minetest.git] / src / player.h

diff --git a/src/player.h b/src/player.h
index d4698ea4a7e810509f7edc044e4b93daee8f4783..4db0e4c58a29769a664a51a5f7e910c4b3d3079a 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -92,6 +92,9 @@ class PlayerSAO;
 struct HudElement;
 class Environment;
 
+// IMPORTANT:
+// Do *not* perform an assignment or copy operation on a Player or
+// RemotePlayer object!  This will copy the lock held for HUD synchronization
 class Player
 {
 public:
@@ -102,7 +105,7 @@ class Player
        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)
+                       std::vector<CollisionInfo> *collision_info)
        {}
 
        v3f getSpeed()
@@ -114,7 +117,7 @@ class Player
        {
                m_speed = speed;
        }
-       
+
        void accelerateHorizontal(v3f target_speed, f32 max_increase);
        void accelerateVertical(v3f target_speed, f32 max_increase);
 
@@ -212,6 +215,56 @@ class Player
                return size;
        }
 
+       void setHotbarItemcount(s32 hotbar_itemcount) {
+               hud_hotbar_itemcount = hotbar_itemcount;
+       }
+       s32 getHotbarItemcount() {
+               return hud_hotbar_itemcount;
+       }
+       void setHotbarImage(std::string name) {
+               hud_hotbar_image = name;
+       }
+       std::string getHotbarImage() {
+               return hud_hotbar_image;
+       }
+       void setHotbarSelectedImage(std::string name) {
+               hud_hotbar_selected_image = name;
+       }
+       std::string getHotbarSelectedImage() {
+               return hud_hotbar_selected_image;
+       }
+
+       void setSky(const video::SColor &bgcolor, const std::string &type,
+                       const std::vector<std::string> &params) {
+               m_sky_bgcolor = bgcolor;
+               m_sky_type = type;
+               m_sky_params = params;
+       }
+       void getSky(video::SColor *bgcolor, std::string *type,
+                       std::vector<std::string> *params) {
+               *bgcolor = m_sky_bgcolor;
+               *type = m_sky_type;
+               *params = m_sky_params;
+       }
+       void overrideDayNightRatio(bool do_override, float ratio) {
+               m_day_night_ratio_do_override = do_override;
+               m_day_night_ratio = ratio;
+       }
+       void getDayNightRatio(bool *do_override, float *ratio) {
+               *do_override = m_day_night_ratio_do_override;
+               *ratio = m_day_night_ratio;
+       }
+       void setLocalAnimations(v2s32 frames[4], float frame_speed) {
+               for (int i = 0; i < 4; i++)
+                       local_animations[i] = frames[i];
+               local_animation_speed = frame_speed;
+       }
+       void getLocalAnimations(v2s32 *frames, float *frame_speed) {
+               for (int i = 0; i < 4; i++)
+                       frames[i] = local_animations[i];
+               *frame_speed = local_animation_speed;
+       }
+
        virtual bool isLocal() const
        { return false; }
        virtual PlayerSAO *getPlayerSAO()
@@ -252,7 +305,9 @@ class Player
        bool is_climbing;
        bool swimming_vertical;
        bool camera_barely_in_ceiling;
-       
+       v3f eye_offset_first;
+       v3f eye_offset_third;
+
        Inventory inventory;
 
        f32 movement_acceleration_default;
@@ -285,15 +340,15 @@ class Player
        u16 peer_id;
 
        std::string inventory_formspec;
-       
+
        PlayerControl control;
        PlayerControl getPlayerControl()
        {
                return control;
        }
-       
+
        u32 keyPressed;
-       
+
 
        HudElement* getHud(u32 id);
        u32         addHud(HudElement* hud);
@@ -305,6 +360,8 @@ class Player
 
        u32 hud_flags;
        s32 hud_hotbar_itemcount;
+       std::string hud_hotbar_image;
+       std::string hud_hotbar_selected_image;
 protected:
        IGameDef *m_gamedef;
 
@@ -319,6 +376,13 @@ class Player
        bool m_dirty;
 
        std::vector<HudElement *> hud;
+
+       std::string m_sky_type;
+       video::SColor m_sky_bgcolor;
+       std::vector<std::string> m_sky_params;
+
+       bool m_day_night_ratio_do_override;
+       float m_day_night_ratio;
 private:
        // Protect some critical areas
        // hud for example can be modified by EmergeThread
@@ -346,7 +410,7 @@ class RemotePlayer : public Player
        void setPlayerSAO(PlayerSAO *sao)
        { m_sao = sao; }
        void setPosition(const v3f &position);
-       
+
 private:
        PlayerSAO *m_sao;
 };