X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fremoteplayer.h;h=965dede508f542a57571fde27d71fc95241b8077;hb=3caad3f3c9e319ca67d63231e8c64b2ace855fff;hp=b9d9c74f540b0ac168ec5517e22d3863a2007e21;hpb=f1d7a26b7c341b468f34325cec5c3d495f175a8f;p=oweals%2Fminetest.git diff --git a/src/remoteplayer.h b/src/remoteplayer.h index b9d9c74f5..965dede50 100644 --- a/src/remoteplayer.h +++ b/src/remoteplayer.h @@ -85,19 +85,21 @@ public: } void setSky(const video::SColor &bgcolor, const std::string &type, - const std::vector ¶ms) + const std::vector ¶ms, 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 *params) + std::vector *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 +107,7 @@ public: 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 +134,7 @@ public: void setDirty(bool dirty) { m_dirty = true; } - u16 protocol_version; + u16 protocol_version = 0; private: /* @@ -146,25 +145,27 @@ private: 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; 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 m_sky_params; + bool m_sky_clouds; + CloudParams m_cloud_params; };