summaryrefslogtreecommitdiff
path: root/src/server.h
diff options
context:
space:
mode:
authorParamat <paramat@users.noreply.github.com>2018-09-08 00:38:35 +0100
committerGitHub <noreply@github.com>2018-09-08 00:38:35 +0100
commit766fb7b46edab47f96b8b940e390daf5319261b7 (patch)
tree59a3bb890cbf8922bd82e4e2fffdda42717c71ea /src/server.h
parent6ed9c6fb3a80bf18b3f9f74e39704558371e8b41 (diff)
downloadminetest-766fb7b46edab47f96b8b940e390daf5319261b7.tar.gz
minetest-766fb7b46edab47f96b8b940e390daf5319261b7.tar.bz2
minetest-766fb7b46edab47f96b8b940e390daf5319261b7.zip
Particles: Make collision with objects optional (#7682)
Also set it to false for node dig particles, as they are often created and high in number. Improve particle documentation.
Diffstat (limited to 'src/server.h')
-rw-r--r--src/server.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server.h b/src/server.h
index 751eaa5f2..c2adbbc07 100644
--- a/src/server.h
+++ b/src/server.h
@@ -229,7 +229,7 @@ public:
void spawnParticle(const std::string &playername,
v3f pos, v3f velocity, v3f acceleration,
float expirationtime, float size,
- bool collisiondetection, bool collision_removal,
+ bool collisiondetection, bool collision_removal, bool object_collision,
bool vertical, const std::string &texture,
const struct TileAnimationParams &animation, u8 glow);
@@ -239,7 +239,7 @@ public:
v3f minacc, v3f maxacc,
float minexptime, float maxexptime,
float minsize, float maxsize,
- bool collisiondetection, bool collision_removal,
+ bool collisiondetection, bool collision_removal, bool object_collision,
ServerActiveObject *attached,
bool vertical, const std::string &texture,
const std::string &playername, const struct TileAnimationParams &animation,
@@ -444,7 +444,7 @@ private:
v3f minacc, v3f maxacc,
float minexptime, float maxexptime,
float minsize, float maxsize,
- bool collisiondetection, bool collision_removal,
+ bool collisiondetection, bool collision_removal, bool object_collision,
u16 attached_id,
bool vertical, const std::string &texture, u32 id,
const struct TileAnimationParams &animation, u8 glow);
@@ -455,7 +455,7 @@ private:
void SendSpawnParticle(session_t peer_id, u16 protocol_version,
v3f pos, v3f velocity, v3f acceleration,
float expirationtime, float size,
- bool collisiondetection, bool collision_removal,
+ bool collisiondetection, bool collision_removal, bool object_collision,
bool vertical, const std::string &texture,
const struct TileAnimationParams &animation, u8 glow);