Merge pull request #1 from TeddyDesTodes/master

+ submenu for key assignment, fast_move and free_move can now be toggled

1 files changed, 23 insertions, 25 deletions

diff --git a/src/guiMessageMenu.h b/src/guiMessageMenu.h
index 82c40ce09..8f48b6626 100644
--- a/src/guiMessageMenu.h
+++ b/src/guiMessageMenu.h
@@ -1,21 +1,21 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+ Minetest-c55
+ Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #ifndef GUIMESSAGEMENU_HEADER
 #define GUIMESSAGEMENU_HEADER
@@ -25,19 +25,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "utility.h"
 #include <string>
 
-class GUIMessageMenu : public GUIModalMenu
+class GUIMessageMenu: public GUIModalMenu
 {
 public:
-	GUIMessageMenu(gui::IGUIEnvironment* env,
-			gui::IGUIElement* parent, s32 id,
-			IMenuManager *menumgr,
-			std::wstring message_text);
+	GUIMessageMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent, s32 id,
+			IMenuManager *menumgr, std::wstring message_text);
 	~GUIMessageMenu();
-	
+
 	void removeChildren();
 	/*
-		Remove and re-add (or reposition) stuff
-	*/
+	 Remove and re-add (or reposition) stuff
+	 */
 	void regenerateGui(v2u32 screensize);
 
 	void drawMenu();
@@ -45,13 +43,13 @@ public:
 	bool OnEvent(const SEvent& event);
 
 	/*
-		true = ok'd
-	*/
+	 true = ok'd
+	 */
 	bool getStatus()
 	{
 		return m_status;
 	}
-	
+
 private:
 	std::wstring m_message_text;
 	bool m_status;