X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FMenu%2FMenu.cpp;h=4c4abfaa32bd55f8557ce62ad1d95477210ac7b3;hb=b32cd80b243d77cd80e026c7ae73e33ec39b1de9;hp=3639740d64cc1d7886d420547f2c09e813b64bfb;hpb=b84825978803615f45a9f128232e62431042aec0;p=lugaru.git
diff --git a/Source/Menu/Menu.cpp b/Source/Menu/Menu.cpp
index 3639740..4c4abfa 100644
--- a/Source/Menu/Menu.cpp
+++ b/Source/Menu/Menu.cpp
@@ -18,19 +18,20 @@ You should have received a copy of the GNU General Public License
along with Lugaru. If not, see .
*/
-#include
-#include
-#include
+#include "Menu/Menu.hpp"
-#include "Graphic/gamegl.h"
-#include "Level/Campaign.h"
-#include "Menu/Menu.h"
-#include "User/Settings.h"
-#include "Utils/Input.h"
+#include "Audio/openal_wrapper.hpp"
+#include "Graphic/gamegl.hpp"
+#include "Level/Campaign.hpp"
+#include "User/Settings.hpp"
+#include "Utils/Input.hpp"
// Should not be needed, Menu should call methods from other classes to launch maps and challenges and so on
-#include "Level/Awards.h"
-#include "Audio/openal_wrapper.h"
+#include "Level/Awards.hpp"
+
+#include
+#include
+#include
using namespace Game;
@@ -48,6 +49,10 @@ extern int leveltheme;
extern void toggleFullscreen();
int entername = 0;
+std::string newusername = "";
+unsigned newuserselected = 0;
+float newuserblinkdelay = 0;
+bool newuserblink = false;
std::vector