Add propper client initialization

[dragonfireclient.git] / src / guiEngine.h

diff --git a/src/guiEngine.h b/src/guiEngine.h
index 3987b52c73dc50df9e6446e86b6f54f3153ccdb6..6b128154676117ba9e6eb22921436ff07f8e8424 100644 (file)
--- a/src/guiEngine.h
+++ b/src/guiEngine.h
@@ -25,17 +25,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 /******************************************************************************/
 #include "irrlichttypes.h"
 #include "modalMenu.h"
-#include "clouds.h"
 #include "guiFormSpecMenu.h"
 #include "sound.h"
+#include "tile.h"
 
 /******************************************************************************/
 /* Typedefs and macros                                                        */
 /******************************************************************************/
-#define MAX_MENUBAR_BTN_COUNT  10
-#define MAX_MENUBAR_BTN_ID             256
-#define MIN_MENUBAR_BTN_ID             (MAX_MENUBAR_BTN_ID - MAX_MENUBAR_BTN_COUNT)
-
 /** texture layer ids */
 typedef enum {
        TEX_LAYER_BACKGROUND = 0,
@@ -50,8 +46,8 @@ typedef enum {
 /******************************************************************************/
 class GUIEngine;
 class MainMenuScripting;
+class Clouds;
 struct MainMenuData;
-struct SimpleSoundSpec;
 
 /******************************************************************************/
 /* declarations                                                               */
@@ -66,6 +62,7 @@ class TextDestGuiEngine : public TextDest
         * @param engine the engine data is transmitted for further processing
         */
        TextDestGuiEngine(GUIEngine* engine);
+
        /**
         * receive fields transmitted by guiFormSpecMenu
         * @param fields map containing formspec field elements currently active
@@ -77,18 +74,58 @@ class TextDestGuiEngine : public TextDest
         * @param text textual representation of event
         */
        void gotText(std::wstring text);
+
 private:
        /** target to transmit data to */
        GUIEngine* m_engine;
 };
 
+/** GUIEngine specific implementation of ISimpleTextureSource */
+class MenuTextureSource : public ISimpleTextureSource
+{
+public:
+       /**
+        * default constructor
+        * @param driver the video driver to load textures from
+        */
+       MenuTextureSource(video::IVideoDriver *driver);
+
+       /**
+        * destructor, removes all loaded textures
+        */
+       virtual ~MenuTextureSource();
+
+       /**
+        * get a texture, loading it if required
+        * @param name path to the texture
+        * @param id receives the texture ID, always 0 in this implementation
+        */
+       video::ITexture* getTexture(const std::string &name, u32 *id = NULL);
+
+private:
+       /** driver to get textures from */
+       video::IVideoDriver *m_driver;
+       /** set of texture names to delete */
+       std::set<std::string> m_to_delete;
+};
+
+/** GUIEngine specific implementation of OnDemandSoundFetcher */
 class MenuMusicFetcher: public OnDemandSoundFetcher
 {
-       std::set<std::string> m_fetched;
 public:
+       /**
+        * get sound file paths according to sound name
+        * @param name sound name
+        * @param dst_paths receives possible paths to sound files
+        * @param dst_datas receives binary sound data (not used here)
+        */
        void fetchSounds(const std::string &name,
                        std::set<std::string> &dst_paths,
                        std::set<std::string> &dst_datas);
+
+private:
+       /** set of fetched sound names */
+       std::set<std::string> m_fetched;
 };
 
 /** implementation of main menu based uppon formspecs */
@@ -109,7 +146,8 @@ class GUIEngine {
                                gui::IGUIElement* parent,
                                IMenuManager *menumgr,
                                scene::ISceneManager* smgr,
-                               MainMenuData* data);
+                               MainMenuData* data,
+                               bool& kill);
 
        /** default destructor */
        virtual ~GUIEngine();
@@ -128,6 +166,9 @@ class GUIEngine {
                return m_scriptdir;
        }
 
+       /** pass async callback to scriptengine **/
+       unsigned int DoAsync(std::string serialized_fct,std::string serialized_params);
+
 private:
 
        /** find and run the main menu script */
@@ -149,6 +190,8 @@ class GUIEngine {
        scene::ISceneManager*   m_smgr;
        /** pointer to data beeing transfered back to main game handling */
        MainMenuData*                   m_data;
+       /** pointer to texture source */
+       ISimpleTextureSource*   m_texture_source;
        /** pointer to soundmanager*/
        ISoundManager*                  m_sound_manager;
 
@@ -159,11 +202,14 @@ class GUIEngine {
        /** the formspec menu */
        GUIFormSpecMenu*                m_menu;
 
+       /** reference to kill variable managed by SIGINT handler */
+       bool&                                   m_kill;
+
        /** variable used to abort menu and return back to main game handling */
        bool                                    m_startgame;
 
        /** scripting interface */
-       MainMenuScripting*                      m_script;
+       MainMenuScripting*              m_script;
 
        /** script basefolder */
        std::string                             m_scriptdir;
@@ -201,7 +247,7 @@ class GUIEngine {
         * @param url url to download
         * @param target file to store to
         */
-       bool downloadFile(std::string url,std::string target);
+       static bool downloadFile(std::string url,std::string target);
 
        /** array containing pointers to current specified texture layers */
        video::ITexture*                m_textures[TEX_LAYER_MAX];