on_death: Fix callback number of pushed arguments (Fixes #6451)

[oweals/minetest.git] / src / client.h

diff --git a/src/client.h b/src/client.h
index 2ee81ea09b68ffff7cd3d95de1154cc5735e80c7..420d188951c610cb08838fa7d44f1da3ccf67b0b 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -41,6 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define CLIENT_CHAT_MESSAGE_LIMIT_PER_10S 10.0f
 
+struct ClientEvent;
 struct MeshMakeData;
 struct ChatMessage;
 class MapBlockMesh;
@@ -68,137 +69,6 @@ enum LocalClientState {
        LC_Ready
 };
 
-enum ClientEventType
-{
-       CE_NONE,
-       CE_PLAYER_DAMAGE,
-       CE_PLAYER_FORCE_MOVE,
-       CE_DEATHSCREEN,
-       CE_SHOW_FORMSPEC,
-       CE_SHOW_LOCAL_FORMSPEC,
-       CE_SPAWN_PARTICLE,
-       CE_ADD_PARTICLESPAWNER,
-       CE_DELETE_PARTICLESPAWNER,
-       CE_HUDADD,
-       CE_HUDRM,
-       CE_HUDCHANGE,
-       CE_SET_SKY,
-       CE_OVERRIDE_DAY_NIGHT_RATIO,
-       CE_CLOUD_PARAMS,
-};
-
-struct ClientEvent
-{
-       ClientEventType type;
-       union{
-               //struct{
-               //} none;
-               struct{
-                       u8 amount;
-               } player_damage;
-               struct{
-                       f32 pitch;
-                       f32 yaw;
-               } player_force_move;
-               struct{
-                       bool set_camera_point_target;
-                       f32 camera_point_target_x;
-                       f32 camera_point_target_y;
-                       f32 camera_point_target_z;
-               } deathscreen;
-               struct{
-                       std::string *formspec;
-                       std::string *formname;
-               } show_formspec;
-               //struct{
-               //} textures_updated;
-               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;
-                       u16 attached_id;
-                       bool vertical;
-                       std::string *texture;
-                       u32 id;
-                       struct TileAnimationParams animation;
-                       u8 glow;
-               } add_particlespawner;
-               struct{
-                       u32 id;
-               } delete_particlespawner;
-               struct{
-                       u32 id;
-                       u8 type;
-                       v2f *pos;
-                       std::string *name;
-                       v2f *scale;
-                       std::string *text;
-                       u32 number;
-                       u32 item;
-                       u32 dir;
-                       v2f *align;
-                       v2f *offset;
-                       v3f *world_pos;
-                       v2s32 * size;
-               } hudadd;
-               struct{
-                       u32 id;
-               } hudrm;
-               struct{
-                       u32 id;
-                       HudElementStat stat;
-                       v2f *v2fdata;
-                       std::string *sdata;
-                       u32 data;
-                       v3f *v3fdata;
-                       v2s32 * v2s32data;
-               } hudchange;
-               struct{
-                       video::SColor *bgcolor;
-                       std::string *type;
-                       std::vector<std::string> *params;
-                       bool clouds;
-               } set_sky;
-               struct{
-                       bool do_override;
-                       float ratio_f;
-               } override_day_night_ratio;
-               struct {
-                       f32 density;
-                       u32 color_bright;
-                       u32 color_ambient;
-                       f32 height;
-                       f32 thickness;
-                       f32 speed_x;
-                       f32 speed_y;
-               } cloud_params;
-       };
-};
-
 /*
        Packet counter
 */
@@ -314,7 +184,6 @@ public:
        void handleCommand_AuthAccept(NetworkPacket* pkt);
        void handleCommand_AcceptSudoMode(NetworkPacket* pkt);
        void handleCommand_DenySudoMode(NetworkPacket* pkt);
-       void handleCommand_InitLegacy(NetworkPacket* pkt);
        void handleCommand_AccessDenied(NetworkPacket* pkt);
        void handleCommand_RemoveNode(NetworkPacket* pkt);
        void handleCommand_AddNode(NetworkPacket* pkt);
@@ -374,7 +243,6 @@ public:
        void sendChangePassword(const std::string &oldpassword,
                const std::string &newpassword);
        void sendDamage(u8 damage);
-       void sendBreath(u16 breath);
        void sendRespawn();
        void sendReady();
 
@@ -450,7 +318,7 @@ public:
 
        bool hasClientEvents() const { return !m_client_event_queue.empty(); }
        // Get event from queue. If queue is empty, it triggers an assertion failure.
-       ClientEvent getClientEvent();
+       ClientEvent * getClientEvent();
 
        bool accessDenied() const { return m_access_denied; }
 
@@ -530,10 +398,7 @@ public:
        ClientScripting *getScript() { return m_script; }
        const bool moddingEnabled() const { return m_modding_enabled; }
 
-       inline void pushToEventQueue(const ClientEvent &event)
-       {
-               m_client_event_queue.push(event);
-       }
+       void pushToEventQueue(ClientEvent *event);
 
        void showGameChat(bool show = true);
        void showGameHud(bool show = true);
@@ -580,7 +445,6 @@ private:
        // helper method shared with clientpackethandler
        static AuthMechanism choseAuthMech(const u32 mechs);
 
-       void sendLegacyInit(const char* playerName, const char* playerPassword);
        void sendInit(const std::string &playerName);
        void startAuth(AuthMechanism chosen_auth_mechanism);
        void sendDeletedBlocks(std::vector<v3s16> &blocks);
@@ -662,7 +526,7 @@ private:
        bool m_access_denied = false;
        bool m_access_denied_reconnect = false;
        std::string m_access_denied_reason = "";
-       std::queue<ClientEvent> m_client_event_queue;
+       std::queue<ClientEvent *> m_client_event_queue;
        bool m_itemdef_received = false;
        bool m_nodedef_received = false;
        ClientMediaDownloader *m_media_downloader;