X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2FguiEngine.h;h=e7e5ca05dc30bae22dad0de4ffd7a3df172fd0ed;hb=605599b6f150b89ba6539c4d088231b326adcb48;hp=fa98a21e4fa7cfc89b516ee9eb648db54da6624f;hpb=14ef2b445adcec770defe1abf83af9d22ccf39d8;p=dragonfireclient.git

diff --git a/src/guiEngine.h b/src/guiEngine.h
index fa98a21e4..e7e5ca05d 100644
--- a/src/guiEngine.h
+++ b/src/guiEngine.h
@@ -80,7 +80,7 @@ class TextDestGuiEngine : public TextDest
 	 * receive text/events transmitted by guiFormSpecMenu
 	 * @param text textual representation of event
 	 */
-	void gotText(std::wstring text);
+	void gotText(const std::wstring &text);
 
 private:
 	/** target to transmit data to */
@@ -139,6 +139,7 @@ class MenuMusicFetcher: public OnDemandSoundFetcher
 class GUIEngine {
 	/** grant ModApiMainMenu access to private members */
 	friend class ModApiMainMenu;
+	friend class ModApiSound;
 
 public:
 	/**
@@ -149,7 +150,8 @@ class GUIEngine {
 	 * @param smgr scene manager to add scene elements to
 	 * @param data struct to transfer data to main game handling
 	 */
-	GUIEngine(	irr::IrrlichtDevice* dev,
+	GUIEngine(irr::IrrlichtDevice* dev,
+			JoystickController *joystick,
 			gui::IGUIElement* parent,
 			IMenuManager *menumgr,
 			scene::ISceneManager* smgr,
@@ -176,7 +178,8 @@ class GUIEngine {
 	}
 
 	/** pass async callback to scriptengine **/
-	unsigned int queueAsync(std::string serialized_fct,std::string serialized_params);
+	unsigned int queueAsync(const std::string &serialized_fct,
+			const std::string &serialized_params);
 
 private:
 
@@ -186,9 +189,6 @@ class GUIEngine {
 	/** run main menu loop */
 	void run();
 
-	/** handler to limit frame rate within main menu */
-	void limitFrameRate();
-
 	/** update size of topleftext element */
 	void updateTopLeftTextSize();
 
@@ -260,19 +260,16 @@ class GUIEngine {
 	 * @param url url to download
 	 * @param target file to store to
 	 */
-	static bool downloadFile(std::string url,std::string target);
+	static bool downloadFile(const std::string &url, const std::string &target);
 
 	/** array containing pointers to current specified texture layers */
 	image_definition m_textures[TEX_LAYER_MAX];
 
-	/** draw version string in topleft corner */
-	void drawVersion();
-
 	/**
-	 * specify text to be appended to version string
+	 * specify text to appear as top left string
 	 * @param text to set
 	 */
-	void setTopleftText(std::string append);
+	void setTopleftText(const std::string &text);
 
 	/** pointer to gui element shown at topleft corner */
 	irr::gui::IGUIStaticText*	m_irr_toplefttext;