From 1357ea1da25bf01acaf95d5f5419d4f83a84ed61 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Fri, 22 May 2020 13:23:25 +0200
Subject: Cleanup of particle & particlespawner structures and code (#9893)

---
 src/client/clientevent.h | 45 +++++++++------------------------------------
 1 file changed, 9 insertions(+), 36 deletions(-)

(limited to 'src/client/clientevent.h')

diff --git a/src/client/clientevent.h b/src/client/clientevent.h
index 7f3984b03..9bd31efce 100644
--- a/src/client/clientevent.h
+++ b/src/client/clientevent.h
@@ -21,8 +21,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <string>
 #include "irrlichttypes_bloated.h"
-#include "hud.h"
-#include "skyparams.h"
+
+struct ParticleParameters;
+struct ParticleSpawnerParameters;
+struct SkyboxParams;
+struct SunParams;
+struct MoonParams;
+struct StarParams;
 
 enum ClientEventType : u8
 {
@@ -77,44 +82,12 @@ struct ClientEvent
 		} show_formspec;
 		// struct{
 		//} textures_updated;
+		ParticleParameters *spawn_particle;
 		struct
 		{
-			v3f *pos;
-			v3f *vel;
-			v3f *acc;
-			f32 expirationtime;
-			f32 size;
-			bool collisiondetection;
-			bool collision_removal;
-			bool object_collision;
-			bool vertical;
-			std::string *texture;
-			struct TileAnimationParams animation;
-			u8 glow;
-		} spawn_particle;
-		struct
-		{
-			u16 amount;
-			f32 spawntime;
-			v3f *minpos;
-			v3f *maxpos;
-			v3f *minvel;
-			v3f *maxvel;
-			v3f *minacc;
-			v3f *maxacc;
-			f32 minexptime;
-			f32 maxexptime;
-			f32 minsize;
-			f32 maxsize;
-			bool collisiondetection;
-			bool collision_removal;
-			bool object_collision;
+			ParticleSpawnerParameters *p;
 			u16 attached_id;
-			bool vertical;
-			std::string *texture;
 			u64 id;
-			struct TileAnimationParams animation;
-			u8 glow;
 		} add_particlespawner;
 		struct
 		{
-- 
cgit v1.2.3