[CSM] Don't Load the package library (#6944)

[minetest.git] / src / remoteplayer.h

diff --git a/src/remoteplayer.h b/src/remoteplayer.h
index b9d9c74f540b0ac168ec5517e22d3863a2007e21..6ecdb2798d932b21b31ff62219353b82658ebada 100644 (file)
--- a/src/remoteplayer.h
+++ b/src/remoteplayer.h
@@ -18,8 +18,7 @@ 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"
@@ -42,7 +41,7 @@ class RemotePlayer : public Player
 
 public:
        RemotePlayer(const char *name, IItemDefManager *idef);
-       virtual ~RemotePlayer() {}
+       virtual ~RemotePlayer() = default;
 
        void deSerialize(std::istream &is, const std::string &playername, PlayerSAO *sao);
 
@@ -85,19 +84,21 @@ class RemotePlayer : public Player
        }
 
        void setSky(const video::SColor &bgcolor, const std::string &type,
-                       const std::vector<std::string> &params)
+                       const std::vector<std::string> &params, bool &clouds)
        {
                m_sky_bgcolor = bgcolor;
                m_sky_type = type;
                m_sky_params = params;
+               m_sky_clouds = clouds;
        }
 
        void getSky(video::SColor *bgcolor, std::string *type,
-                       std::vector<std::string> *params)
+                       std::vector<std::string> *params, bool *clouds)
        {
                *bgcolor = m_sky_bgcolor;
                *type = m_sky_type;
                *params = m_sky_params;
+               *clouds = m_sky_clouds;
        }
 
        void setCloudParams(const CloudParams &cloud_params)
@@ -105,10 +106,7 @@ class RemotePlayer : public Player
                m_cloud_params = cloud_params;
        }
 
-       const CloudParams &getCloudParams() const
-       {
-               return m_cloud_params;
-       }
+       const CloudParams &getCloudParams() const { return m_cloud_params; }
 
        bool checkModified() const { return m_dirty || inventory.checkModified(); }
 
@@ -135,7 +133,11 @@ class RemotePlayer : public Player
 
        void setDirty(bool dirty) { m_dirty = true; }
 
-       u16 protocol_version;
+       u16 protocol_version = 0;
+
+       session_t getPeerId() const { return m_peer_id; }
+
+       void setPeerId(session_t peer_id) { m_peer_id = peer_id; }
 
 private:
        /*
@@ -146,26 +148,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;
+       bool m_sky_clouds;
+
        CloudParams m_cloud_params;
-};
 
-#endif
+       session_t m_peer_id = PEER_ID_INEXISTENT;
+};