Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / client / clientevent.h

diff --git a/src/client/clientevent.h b/src/client/clientevent.h
index 67125cce62a580a0505a2b9f99fd3e58e525b314..9bd31efce0eaaa7ac2aff53c88f16fa887935175 100644 (file)
--- a/src/client/clientevent.h
+++ b/src/client/clientevent.h
@@ -21,7 +21,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <string>
 #include "irrlichttypes_bloated.h"
-#include "hud.h"
+
+struct ParticleParameters;
+struct ParticleSpawnerParameters;
+struct SkyboxParams;
+struct SunParams;
+struct MoonParams;
+struct StarParams;
 
 enum ClientEventType : u8
 {
@@ -38,6 +44,9 @@ enum ClientEventType : u8
        CE_HUDRM,
        CE_HUDCHANGE,
        CE_SET_SKY,
+       CE_SET_SUN,
+       CE_SET_MOON,
+       CE_SET_STARS,
        CE_OVERRIDE_DAY_NIGHT_RATIO,
        CE_CLOUD_PARAMS,
        CLIENTEVENT_MAX,
@@ -52,7 +61,7 @@ struct ClientEvent
                //} none;
                struct
                {
-                       u8 amount;
+                       u16 amount;
                } player_damage;
                struct
                {
@@ -73,42 +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 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;
+                       ParticleSpawnerParameters *p;
                        u16 attached_id;
-                       bool vertical;
-                       std::string *texture;
-                       u32 id;
-                       struct TileAnimationParams animation;
-                       u8 glow;
+                       u64 id;
                } add_particlespawner;
                struct
                {
@@ -116,7 +95,7 @@ struct ClientEvent
                } delete_particlespawner;
                struct
                {
-                       u32 id;
+                       u32 server_id;
                        u8 type;
                        v2f *pos;
                        std::string *name;
@@ -129,6 +108,8 @@ struct ClientEvent
                        v2f *offset;
                        v3f *world_pos;
                        v2s32 *size;
+                       s16 z_index;
+                       std::string *text2;
                } hudadd;
                struct
                {
@@ -144,13 +125,7 @@ struct ClientEvent
                        v3f *v3fdata;
                        v2s32 *v2s32data;
                } hudchange;
-               struct
-               {
-                       video::SColor *bgcolor;
-                       std::string *type;
-                       std::vector<std::string> *params;
-                       bool clouds;
-               } set_sky;
+               SkyboxParams *set_sky;
                struct
                {
                        bool do_override;
@@ -166,5 +141,8 @@ struct ClientEvent
                        f32 speed_x;
                        f32 speed_y;
                } cloud_params;
+               SunParams *sun_params;
+               MoonParams *moon_params;
+               StarParams *star_params;
        };
 };