summaryrefslogtreecommitdiff
path: root/src/server.h
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2018-03-08 22:19:25 +0100
committerLoïc Blot <nerzhul@users.noreply.github.com>2018-03-08 23:00:17 +0100
commitc7c03ad7a60b77040d0dfc360a79f065e0c2c971 (patch)
tree148e6617ced494a4f1cae085666bcd06eb14a1d3 /src/server.h
parentc7656edaa57a951f2496d454a42cdf899459b572 (diff)
downloadminetest-c7c03ad7a60b77040d0dfc360a79f065e0c2c971.tar.gz
minetest-c7c03ad7a60b77040d0dfc360a79f065e0c2c971.tar.bz2
minetest-c7c03ad7a60b77040d0dfc360a79f065e0c2c971.zip
Cleanup & bugfix
* ObjectRef::set_local_animation: fix wrong lua return (should push a boolean, currently returns nil) * ObjectRef::set_eye_offset: fix wrong lua return (should push a boolean, currently returns nil) * Fix various Server functions which depends on RemotePlayer objet and return true/false when player object is nil whereas it's a caller implementation error. Change those bool functions to void and add sanitize_check call instead. Current callers are always checking player object validity * Optimize Server::setClouds : use CloudParams object ref instead of attribute deserialization from structure & perform RemotePlayer::setCloudParams directly in server class like many other calls * Optimize Server::SendCloudParams: use CloudParams object ref instead of deserialized attributes
Diffstat (limited to 'src/server.h')
-rw-r--r--src/server.h21
1 files changed, 6 insertions, 15 deletions
diff --git a/src/server.h b/src/server.h
index 3b9b72021..8d5cd6da4 100644
--- a/src/server.h
+++ b/src/server.h
@@ -59,6 +59,7 @@ class EmergeManager;
class ServerScripting;
class ServerEnvironment;
struct SimpleSoundSpec;
+struct CloudParams;
class ServerThread;
enum ClientDeletionReason {
@@ -295,19 +296,14 @@ public:
Address getPeerAddress(session_t peer_id);
- bool setLocalPlayerAnimations(RemotePlayer *player, v2s32 animation_frames[4],
+ void setLocalPlayerAnimations(RemotePlayer *player, v2s32 animation_frames[4],
f32 frame_speed);
- bool setPlayerEyeOffset(RemotePlayer *player, v3f first, v3f third);
+ void setPlayerEyeOffset(RemotePlayer *player, const v3f &first, const v3f &third);
- bool setSky(RemotePlayer *player, const video::SColor &bgcolor,
+ void setSky(RemotePlayer *player, const video::SColor &bgcolor,
const std::string &type, const std::vector<std::string> &params,
bool &clouds);
- bool setClouds(RemotePlayer *player, float density,
- const video::SColor &color_bright,
- const video::SColor &color_ambient,
- float height,
- float thickness,
- const v2f &speed);
+ void setClouds(RemotePlayer *player, const CloudParams &params);
bool overrideDayNightRatio(RemotePlayer *player, bool do_override, float brightness);
@@ -389,12 +385,7 @@ private:
void SendSetSky(session_t peer_id, const video::SColor &bgcolor,
const std::string &type, const std::vector<std::string> &params,
bool &clouds);
- void SendCloudParams(session_t peer_id, float density,
- const video::SColor &color_bright,
- const video::SColor &color_ambient,
- float height,
- float thickness,
- const v2f &speed);
+ void SendCloudParams(session_t peer_id, const CloudParams &params);
void SendOverrideDayNightRatio(session_t peer_id, bool do_override, float ratio);
void broadcastModChannelMessage(const std::string &channel,
const std::string &message, session_t from_peer);