From 5fd1ef9b589419e2464f5599ea47a2f28f4d7b7b Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Mon, 14 Nov 2016 15:28:06 +0100
Subject: Revert "Adding particle blend, glow and animation (#4705)"

This reverts commit 93e3555eae2deaeca69ee252cfa9cc9c3e0e49ef.
---
 src/server.cpp | 44 ++++++--------------------------------------
 1 file changed, 6 insertions(+), 38 deletions(-)

(limited to 'src/server.cpp')

diff --git a/src/server.cpp b/src/server.cpp
index cef57be88..48331e4f8 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1658,11 +1658,7 @@ void Server::SendShowFormspecMessage(u16 peer_id, const std::string &formspec,
 void Server::SendSpawnParticle(u16 peer_id, 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)
 {
 	DSTACK(FUNCTION_NAME);
 
@@ -1674,12 +1670,6 @@ void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f accelerat
 	pkt << vertical;
 	pkt << collision_removal;
 
-	pkt << material_type_param 
-		<< (u8)animation_type
-		<< vertical_frame_num 
-		<< horizontal_frame_num << first_frame 
-		<< frame_length << loop_animation << glow;
-
 	if (peer_id != PEER_ID_INEXISTENT) {
 		Send(&pkt);
 	}
@@ -1692,10 +1682,7 @@ void Server::SendSpawnParticle(u16 peer_id, v3f pos, v3f velocity, v3f accelerat
 void Server::SendAddParticleSpawner(u16 peer_id, u16 amount, float spawntime, v3f minpos, v3f maxpos,
 	v3f minvel, v3f maxvel, v3f minacc, v3f maxacc, float minexptime, float maxexptime,
 	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)
+	u16 attached_id, bool vertical, const std::string &texture, u32 id)
 {
 	DSTACK(FUNCTION_NAME);
 
@@ -1711,12 +1698,6 @@ void Server::SendAddParticleSpawner(u16 peer_id, u16 amount, float spawntime, v3
 	pkt << collision_removal;
 	pkt << attached_id;
 
-	pkt << material_type_param 
-		<< (u8)animation_type
-		<< vertical_frame_num << horizontal_frame_num 
-		<< min_first_frame << max_first_frame
-		<< frame_length << loop_animation << glow;
-
 	if (peer_id != PEER_ID_INEXISTENT) {
 		Send(&pkt);
 	}
@@ -3166,11 +3147,7 @@ void Server::spawnParticle(const std::string &playername, 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)
 {
 	// m_env will be NULL if the server is initializing
 	if (!m_env)
@@ -3186,11 +3163,7 @@ void Server::spawnParticle(const std::string &playername, v3f pos,
 
 	SendSpawnParticle(peer_id, pos, velocity, acceleration,
 			expirationtime, size, collisiondetection,
-			collision_removal, vertical, texture,
-			material_type_param, animation_type,
-			vertical_frame_num, horizontal_frame_num, 
-			first_frame, frame_length, loop_animation, 
-			glow);
+			collision_removal, vertical, texture);
 }
 
 u32 Server::addParticleSpawner(u16 amount, float spawntime,
@@ -3198,9 +3171,7 @@ u32 Server::addParticleSpawner(u16 amount, float spawntime,
 	float minexptime, float maxexptime, float minsize, float maxsize,
 	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)
 {
 	// m_env will be NULL if the server is initializing
 	if (!m_env)
@@ -3226,10 +3197,7 @@ u32 Server::addParticleSpawner(u16 amount, float spawntime,
 		minpos, maxpos, minvel, maxvel, minacc, maxacc,
 		minexptime, maxexptime, minsize, maxsize,
 		collisiondetection, collision_removal, attached_id, vertical,
-		texture, id, material_type_param, animation_type,
-		vertical_frame_num, horizontal_frame_num, 
-		min_first_frame, max_first_frame, frame_length, loop_animation,
-		glow);
+		texture, id);
 
 	return id;
 }
-- 
cgit v1.2.3