summaryrefslogtreecommitdiff
path: root/src/server.h
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2016-11-14 15:28:06 +0100
committersfan5 <sfan5@live.de>2016-11-14 15:28:06 +0100
commit5fd1ef9b589419e2464f5599ea47a2f28f4d7b7b (patch)
tree5008360c4d239d5dfff8eee78b5ea79f69e176dc /src/server.h
parent93e3555eae2deaeca69ee252cfa9cc9c3e0e49ef (diff)
downloadminetest-5fd1ef9b589419e2464f5599ea47a2f28f4d7b7b.tar.gz
minetest-5fd1ef9b589419e2464f5599ea47a2f28f4d7b7b.tar.bz2
minetest-5fd1ef9b589419e2464f5599ea47a2f28f4d7b7b.zip
Revert "Adding particle blend, glow and animation (#4705)"
This reverts commit 93e3555eae2deaeca69ee252cfa9cc9c3e0e49ef.
Diffstat (limited to 'src/server.h')
-rw-r--r--src/server.h27
1 files changed, 4 insertions, 23 deletions
diff --git a/src/server.h b/src/server.h
index 9a8d22b2e..9e844e36c 100644
--- a/src/server.h
+++ b/src/server.h
@@ -26,7 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "hud.h"
#include "gamedef.h"
#include "serialization.h" // For SER_FMT_VER_INVALID
-#include "nodedef.h" // AnimationType
#include "mods.h"
#include "inventorymanager.h"
#include "subgame.h"
@@ -255,11 +254,7 @@ public:
v3f pos, v3f velocity, v3f acceleration,
float expirationtime, float size,
bool collisiondetection, bool collision_removal,
- bool vertical, const std::string &texture,
- u32 material_type_param, AnimationType animation_type,
- u16 vertical_frame_num, u16 horizontal_frame_num, u16 first_frame,
- float frame_length, bool loop_animation,
- u8 glow);
+ bool vertical, const std::string &texture);
u32 addParticleSpawner(u16 amount, float spawntime,
v3f minpos, v3f maxpos,
@@ -270,12 +265,7 @@ public:
bool collisiondetection, bool collision_removal,
ServerActiveObject *attached,
bool vertical, const std::string &texture,
- const std::string &playername,
- u32 material_type_param, AnimationType animation_type,
- u16 vertical_frame_num, u16 horizontal_frame_num,
- u16 min_first_frame, u16 max_first_frame,
- float frame_length, bool loop_animation,
- u8 glow);
+ const std::string &playername);
void deleteParticleSpawner(const std::string &playername, u32 id);
@@ -451,12 +441,7 @@ private:
float minsize, float maxsize,
bool collisiondetection, bool collision_removal,
u16 attached_id,
- bool vertical, const std::string &texture, u32 id,
- u32 material_type_param, AnimationType animation_type,
- u16 vertical_frame_num, u16 horizontal_frame_num,
- u16 min_first_frame, u16 max_first_frame,
- float frame_length, bool loop_animation,
- u8 glow);
+ bool vertical, const std::string &texture, u32 id);
void SendDeleteParticleSpawner(u16 peer_id, u32 id);
@@ -465,11 +450,7 @@ private:
v3f pos, v3f velocity, v3f acceleration,
float expirationtime, float size,
bool collisiondetection, bool collision_removal,
- bool vertical, const std::string &texture,
- u32 material_type_param, AnimationType animation_type,
- u16 vertical_frame_num, u16 horizontal_frame_num, u16 first_frame,
- float frame_length, bool loop_animation,
- u8 glow);
+ bool vertical, const std::string &texture);
u32 SendActiveObjectRemoveAdd(u16 peer_id, const std::string &datas);
void SendActiveObjectMessages(u16 peer_id, const std::string &datas, bool reliable = true);