X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsupertux.cpp;h=c29d7f3b7ca9c122832469720245ddf21c964c33;hb=4c53a552c13dbe9d587e34e3cf48e82877d09288;hp=00fd2e1ad39ff7395e213f4b5c980790daf60e10;hpb=e43b147d6a1557b535b035ef5c8c4a3a1cb898f1;p=supertux.git

diff --git a/src/supertux.cpp b/src/supertux.cpp
index 00fd2e1ad..c29d7f3b7 100644
--- a/src/supertux.cpp
+++ b/src/supertux.cpp
@@ -23,38 +23,44 @@
 #include <iostream>
 #include <exception>
 
-#include "exceptions.h"
+#include "utils/exceptions.h"
 #include "defines.h"
-#include "globals.h"
-#include "setup.h"
+#include "app/globals.h"
+#include "app/setup.h"
 #include "intro.h"
 #include "title.h"
 #include "gameloop.h"
 #include "leveleditor.h"
-#include "screen/screen.h"
+#include "video/screen.h"
 #include "worldmap.h"
 #include "resources.h"
-#include "screen/surface.h"
+#include "video/surface.h"
 #include "tile_manager.h"
-#include "gettext.h"
+#include "app/gettext.h"
+#include "player.h"
+#include "misc.h"
+#include "utils/configfile.h"
 
 int main(int argc, char * argv[])
 {
 #ifndef DEBUG
   try {
 #endif
+    config = new MyConfig;
     setlocale(LC_ALL, "");
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
     bind_textdomain_codeset(PACKAGE, "ISO-8859-1");
-      
-    st_directory_setup();
-    parseargs(argc, argv);
+    
+    Setup::info(PACKAGE_NAME,PACKAGE,PACKAGE_VERSION);  
+    
+    Setup::directories();
+    Setup::parseargs(argc, argv);
 
-    st_audio_setup();
-    st_video_setup();
-    st_joystick_setup();
-    st_general_setup();
+    Setup::audio();
+    Setup::video(SCREEN_W,SCREEN_H);
+    Setup::joystick();
+    Setup::general();
     st_menu();
     loadshared();
 
@@ -93,12 +99,13 @@ int main(int argc, char * argv[])
     //SDL_Flip(screen);
 
     unloadshared();
-    st_general_free();
+    Setup::general_free();
+    st_menu_free();
     TileManager::destroy_instance();
     #ifdef DEBUG
     Surface::debug_check();
     #endif
-    st_shutdown();
+    Termination::shutdown();
 #ifndef DEBUG  // we want to see the backtrace in gdb when in debug mode
   }
   catch (SuperTuxException &e)