X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgui%2Fmenu.cpp;h=fd253e9beca49bd40746c3535ca6c137ce57ae66;hb=HEAD;hp=158bb069bfd55aa76fac1463cb82333a743f2f47;hpb=84abfaeb33c5bf8dac0cfd9499d9d4c3e7d39881;p=supertux.git
diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
index 158bb069b..fd253e9be 100644
--- a/src/gui/menu.cpp
+++ b/src/gui/menu.cpp
@@ -14,283 +14,64 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-#include
-
-#include "control/joystickkeyboardcontroller.hpp"
#include "gui/menu.hpp"
-#include "supertux/main.hpp"
-#include "supertux/mainloop.hpp"
+
+#include
+#include
+
+#include "control/input_manager.hpp"
+#include "gui/menu_item.hpp"
+#include "gui/menu_manager.hpp"
+#include "gui/mousecursor.hpp"
+#include "supertux/colorscheme.hpp"
+#include "supertux/globals.hpp"
#include "supertux/resources.hpp"
+#include "supertux/screen_manager.hpp"
#include "supertux/timer.hpp"
#include "util/gettext.hpp"
#include "video/drawing_context.hpp"
+#include "video/font.hpp"
+#include "video/renderer.hpp"
+#include "video/video_system.hpp"
static const float MENU_REPEAT_INITIAL = 0.4f;
static const float MENU_REPEAT_RATE = 0.1f;
-static const float FLICK_CURSOR_TIME = 0.5f;
-
-extern SDL_Surface* g_screen;
-
-std::vector