Fix crash when no world is selected and configure button is pressed.

[minetest.git] / src / client.h

diff --git a/src/client.h b/src/client.h
index c6858f5497c42847951ec2f4666eb4ac05858134..43fac9c9ad39d7ccca95bd8626999adc647f45ea 100644 (file)
--- a/src/client.h
+++ b/src/client.h
@@ -34,6 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filecache.h"
 #include "localplayer.h"
 #include "server.h"
+#include "particles.h"
 #include "util/pointedthing.h"
 
 struct MeshMakeData;
@@ -154,7 +155,8 @@ enum ClientEventType
        CE_PLAYER_DAMAGE,
        CE_PLAYER_FORCE_MOVE,
        CE_DEATHSCREEN,
-       CE_TEXTURES_UPDATED
+       CE_TEXTURES_UPDATED,
+       CE_SHOW_FORMSPEC
 };
 
 struct ClientEvent
@@ -176,6 +178,10 @@ struct ClientEvent
                        f32 camera_point_target_y;
                        f32 camera_point_target_z;
                } deathscreen;
+               struct{
+                       std::string* formspec;
+                       std::string* formname;
+               } show_formspec;
                struct{
                } textures_updated;
        };
@@ -371,7 +377,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
        MtEventManager *m_event;
 
        MeshUpdateThread m_mesh_update_thread;
-       core::list<MediaFetchThread> m_media_fetch_threads;
+       core::list<MediaFetchThread*> m_media_fetch_threads;
        ClientEnvironment m_env;
        con::Connection m_con;
        IrrlichtDevice *m_device;