Fix formspec list spacing (#10861)

[dragonfireclient.git] / src / remoteplayer.h

diff --git a/src/remoteplayer.h b/src/remoteplayer.h
index ce7db56081f41a7048feac2c21ca8171482107cd..e4209c54f26d07b890d1061b5b0ad0665c9ad4c3 100644 (file)
--- a/src/remoteplayer.h
+++ b/src/remoteplayer.h
@@ -18,10 +18,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef REMOTEPLAYER_HEADER
-#define REMOTEPLAYER_HEADER
+#pragma once
 
 #include "player.h"
+#include "cloudparams.h"
+#include "skyparams.h"
 
 class PlayerSAO;
 
@@ -38,9 +39,10 @@ enum RemotePlayerChatResult
 class RemotePlayer : public Player
 {
        friend class PlayerDatabaseFiles;
+
 public:
        RemotePlayer(const char *name, IItemDefManager *idef);
-       virtual ~RemotePlayer() {}
+       virtual ~RemotePlayer() = default;
 
        void deSerialize(std::istream &is, const std::string &playername, PlayerSAO *sao);
 
@@ -70,7 +72,7 @@ class RemotePlayer : public Player
 
        void setHotbarImage(const std::string &name) { hud_hotbar_image = name; }
 
-       std::string getHotbarImage() const { return hud_hotbar_image; }
+       const std::string &getHotbarImage() const { return hud_hotbar_image; }
 
        void setHotbarSelectedImage(const std::string &name)
        {
@@ -82,30 +84,35 @@ class RemotePlayer : public Player
                return hud_hotbar_selected_image;
        }
 
-       void setSky(const video::SColor &bgcolor, const std::string &type,
-                       const std::vector<std::string> &params)
+       void setSky(const SkyboxParams &skybox_params)
        {
-               m_sky_bgcolor = bgcolor;
-               m_sky_type = type;
-               m_sky_params = params;
+               m_skybox_params = skybox_params;
        }
 
-       void getSky(video::SColor *bgcolor, std::string *type,
-                       std::vector<std::string> *params)
+       const SkyboxParams &getSkyParams() const { return m_skybox_params; }
+
+       void setSun(const SunParams &sun_params) { m_sun_params = sun_params; }
+
+       const SunParams &getSunParams() const { return m_sun_params; }
+
+       void setMoon(const MoonParams &moon_params) { m_moon_params = moon_params; }
+
+       const MoonParams &getMoonParams() const { return m_moon_params; }
+
+       void setStars(const StarParams &star_params) { m_star_params = star_params; }
+
+       const StarParams &getStarParams() const { return m_star_params; }
+
+       void setCloudParams(const CloudParams &cloud_params)
        {
-               *bgcolor = m_sky_bgcolor;
-               *type = m_sky_type;
-               *params = m_sky_params;
+               m_cloud_params = cloud_params;
        }
 
+       const CloudParams &getCloudParams() const { return m_cloud_params; }
+
        bool checkModified() const { return m_dirty || inventory.checkModified(); }
 
-       void setModified(const bool x)
-       {
-               m_dirty = x;
-               if (!x)
-                       inventory.setModified(x);
-       }
+       inline void setModified(const bool x) { m_dirty = x; }
 
        void setLocalAnimations(v2s32 frames[4], float frame_speed)
        {
@@ -123,7 +130,16 @@ class RemotePlayer : public Player
 
        void setDirty(bool dirty) { m_dirty = true; }
 
-       u16 protocol_version;
+       u16 protocol_version = 0;
+
+       // v1 for clients older than 5.1.0-dev
+       u16 formspec_version = 1;
+
+       session_t getPeerId() const { return m_peer_id; }
+
+       void setPeerId(session_t peer_id) { m_peer_id = peer_id; }
+
+       void onSuccessfulSave();
 
 private:
        /*
@@ -134,25 +150,28 @@ class RemotePlayer : public Player
        void serialize(std::ostream &os);
        void serializeExtraAttributes(std::string &output);
 
-       PlayerSAO *m_sao;
-       bool m_dirty;
+       PlayerSAO *m_sao = nullptr;
+       bool m_dirty = false;
 
        static bool m_setting_cache_loaded;
        static float m_setting_chat_message_limit_per_10sec;
        static u16 m_setting_chat_message_limit_trigger_kick;
 
-       u32 m_last_chat_message_sent;
-       float m_chat_message_allowance;
-       u16 m_message_rate_overhead;
+       u32 m_last_chat_message_sent = std::time(0);
+       float m_chat_message_allowance = 5.0f;
+       u16 m_message_rate_overhead = 0;
 
-       bool m_day_night_ratio_do_override;
+       bool m_day_night_ratio_do_override = false;
        float m_day_night_ratio;
-       std::string hud_hotbar_image;
-       std::string hud_hotbar_selected_image;
+       std::string hud_hotbar_image = "";
+       std::string hud_hotbar_selected_image = "";
 
-       std::string m_sky_type;
-       video::SColor m_sky_bgcolor;
-       std::vector<std::string> m_sky_params;
-};
+       CloudParams m_cloud_params;
 
-#endif
+       SkyboxParams m_skybox_params;
+       SunParams m_sun_params;
+       MoonParams m_moon_params;
+       StarParams m_star_params;
+
+       session_t m_peer_id = PEER_ID_INEXISTENT;
+};