X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsupertux%2Fmain.hpp;h=277280b5b4491c61c935a96cabebd8eb013a2a34;hb=575ee7830c331b48172dccacc7a96188f8d6695b;hp=4f231d1de7256fa01976ed68ea59de5b86ab22db;hpb=e2797515b41729a64a043cbd997be575ebc7307d;p=supertux.git

diff --git a/src/supertux/main.hpp b/src/supertux/main.hpp
index 4f231d1de..277280b5b 100644
--- a/src/supertux/main.hpp
+++ b/src/supertux/main.hpp
@@ -20,21 +20,15 @@
 class Main
 {
 private:
-  void init_config();
   void init_tinygettext();
-  void init_physfs(const char* argv0);
-  void print_usage(const char* argv0);
-  bool parse_commandline(int argc, char** argv);
-  void init_sdl();
-  void init_rand();
-  void init_audio();
-  void quit_audio();
-  bool pre_parse_commandline(int argc, char** argv);
+  void init_video();
+
+  void launch_game();
 
 public:
-  int  main(int argc, char** argv);
-  void init_video();
-  void wait_for_event(float min_delay, float max_delay);
+  /** We call it run() instead of main() as main collides with
+      #define main SDL_main from SDL.h */
+  int run(int argc, char** argv);
 };
 
 #endif