X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FMenu%2FMenu.cpp;h=776d8258b5a3d284421027121db34372c2fe7bc1;hb=8f372db25c010303cc25868b48cb5c0d0a540067;hp=3639740d64cc1d7886d420547f2c09e813b64bfb;hpb=b84825978803615f45a9f128232e62431042aec0;p=lugaru.git
diff --git a/Source/Menu/Menu.cpp b/Source/Menu/Menu.cpp
index 3639740..776d825 100644
--- a/Source/Menu/Menu.cpp
+++ b/Source/Menu/Menu.cpp
@@ -1,6 +1,6 @@
/*
Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
This file is part of Lugaru.
@@ -18,24 +18,26 @@ 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"
+#include "Version.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;
extern float multiplier;
-extern std::set> resolutions;
+extern std::set> resolutions;
extern int mainmenu;
extern std::vector campaignlevels;
extern float musicvolume[4];
@@ -48,26 +50,30 @@ extern int leveltheme;
extern void toggleFullscreen();
int entername = 0;
+std::string newusername = "";
+unsigned newuserselected = 0;
+float newuserblinkdelay = 0;
+bool newuserblink = false;
std::vector