Catch SendFailedException when replying back in Connection::Receive()

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

diff --git a/src/client.h b/src/client.h
index 87c7e328dbca8ac94762cf317b5e09a3325591be..52dd66ca2c6d2b1cd369d0bde77f80a8774b070c 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -113,7 +113,8 @@ enum ClientEventType
 {
        CE_NONE,
        CE_PLAYER_DAMAGE,
-       CE_PLAYER_FORCE_MOVE
+       CE_PLAYER_FORCE_MOVE,
+       CE_DEATHSCREEN,
 };
 
 struct ClientEvent
@@ -129,6 +130,12 @@ struct ClientEvent
                        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;
        };
 };
 
@@ -183,7 +190,7 @@ public:
 
        void groundAction(u8 action, v3s16 nodepos_undersurface,
                        v3s16 nodepos_oversurface, u16 item);
-       void clickActiveObject(u8 button, u16 id, u16 item);
+       void clickActiveObject(u8 button, u16 id, u16 item_i);
 
        void sendSignNodeText(v3s16 p, std::string text);
        void sendInventoryAction(InventoryAction *a);
@@ -191,6 +198,7 @@ public:
        void sendChangePassword(const std::wstring oldpassword,
                const std::wstring newpassword);
        void sendDamage(u8 damage);
+       void sendRespawn();
        
        // locks envlock
        void removeNode(v3s16 p);
@@ -293,6 +301,8 @@ public:
                return m_access_denied_reason;
        }
 
+       float getRTT(void);
+
 private:
        
        // Virtual methods from con::PeerHandler