projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Expose getPointedThing to Lua
[oweals/minetest.git]
/
src
/
remoteplayer.h
diff --git
a/src/remoteplayer.h
b/src/remoteplayer.h
index 4b96835fcf8df09906da277a152a2da8dfba96b3..965dede508f542a57571fde27d71fc95241b8077 100644
(file)
--- a/
src/remoteplayer.h
+++ b/
src/remoteplayer.h
@@
-22,6
+22,7
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#define REMOTEPLAYER_HEADER
#include "player.h"
#define REMOTEPLAYER_HEADER
#include "player.h"
+#include "cloudparams.h"
class PlayerSAO;
class PlayerSAO;
@@
-84,21
+85,30
@@
public:
}
void setSky(const video::SColor &bgcolor, const std::string &type,
}
void setSky(const video::SColor &bgcolor, const std::string &type,
- const std::vector<std::string> ¶ms)
+ const std::vector<std::string> ¶ms
, bool &clouds
)
{
m_sky_bgcolor = bgcolor;
m_sky_type = type;
m_sky_params = params;
{
m_sky_bgcolor = bgcolor;
m_sky_type = type;
m_sky_params = params;
+ m_sky_clouds = clouds;
}
void getSky(video::SColor *bgcolor, std::string *type,
}
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;
{
*bgcolor = m_sky_bgcolor;
*type = m_sky_type;
*params = m_sky_params;
+ *clouds = m_sky_clouds;
}
}
+ void setCloudParams(const CloudParams &cloud_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)
bool checkModified() const { return m_dirty || inventory.checkModified(); }
void setModified(const bool x)
@@
-124,7
+134,7
@@
public:
void setDirty(bool dirty) { m_dirty = true; }
void setDirty(bool dirty) { m_dirty = true; }
- u16 protocol_version;
+ u16 protocol_version
= 0
;
private:
/*
private:
/*
@@
-135,25
+145,28
@@
private:
void serialize(std::ostream &os);
void serializeExtraAttributes(std::string &output);
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;
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;
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<std::string> m_sky_params;
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
};
#endif