Merge pull request #10 from corarona/master

[dragonfireclient.git] / src / gui / guiEngine.h

diff --git a/src/gui/guiEngine.h b/src/gui/guiEngine.h
index 817d7601440bd324d8bc93d4501dba1d64d0448f..f9ad0fb0a90c8e8fe70a9ebbf38de3d076c37df7 100644 (file)
--- a/src/gui/guiEngine.h
+++ b/src/gui/guiEngine.h
@@ -23,9 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 /* Includes                                                                   */
 /******************************************************************************/
 #include "irrlichttypes.h"
-#include "modalMenu.h"
 #include "guiFormSpecMenu.h"
-#include "sound.h"
+#include "client/sound.h"
 #include "client/tile.h"
 #include "util/enriched_string.h"
 
@@ -221,6 +220,8 @@ class GUIEngine {
        /** script basefolder */
        std::string              m_scriptdir = "";
 
+       void setFormspecPrepend(const std::string &fs);
+
        /**
         * draw background layer
         * @param driver to use for drawing
@@ -247,7 +248,7 @@ class GUIEngine {
         * @param layer draw layer to specify texture
         * @param texturepath full path of texture to load
         */
-       bool setTexture(texture_layer layer, std::string texturepath,
+       bool setTexture(texture_layer layer, const std::string &texturepath,
                        bool tile_image, unsigned int minsize);
 
        /**
@@ -296,7 +297,7 @@ class GUIEngine {
        clouddata   m_cloud;
 
        /** start playing a sound and return handle */
-       s32 playSound(SimpleSoundSpec spec, bool looped);
+       s32 playSound(const SimpleSoundSpec &spec, bool looped);
        /** stop playing a sound started with playSound() */
        void stopSound(s32 handle);