X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsupertux.cpp;h=81856f6e638e6778afad4a15a3e975ca94e42fe5;hb=b47938ec825a6bbf5ef8f49f0f893d2647a79c71;hp=01f15f8202f9ce49d36b32f366bfdbac6d4ab61f;hpb=6d682d915eb92b08f2a92906a07d77f0749f0b6c;p=supertux.git

diff --git a/src/supertux.cpp b/src/supertux.cpp
index 01f15f820..81856f6e6 100644
--- a/src/supertux.cpp
+++ b/src/supertux.cpp
@@ -17,14 +17,15 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
+#include <config.h>
 
 #include <sys/types.h>
 #include <cctype>
 #include <iostream>
 #include <exception>
+#include <locale.h>
 
-#include "utils/exceptions.h"
-#include "app/defines.h"
+#include "defines.h"
 #include "app/globals.h"
 #include "app/setup.h"
 #include "intro.h"
@@ -37,7 +38,6 @@
 #include "video/surface.h"
 #include "tile_manager.h"
 #include "app/gettext.h"
-#include "player.h"
 #include "misc.h"
 #include "utils/configfile.h"
 
@@ -47,20 +47,15 @@ int main(int argc, char * argv[])
   try {
 #endif
     config = new MyConfig;
-    setlocale(LC_ALL, "");
-    bindtextdomain(PACKAGE, LOCALEDIR);
-    textdomain(PACKAGE);
-    bind_textdomain_codeset(PACKAGE, "ISO-8859-1");
+   
+    Setup::init(PACKAGE_NAME, PACKAGE_NAME, PACKAGE_VERSION);
     
-    st_info_setup(PACKAGE_NAME,PACKAGE,PACKAGE_VERSION);  
-    
-    st_directory_setup();
-    parseargs(argc, argv);
+    Setup::parseargs(argc, argv);
 
-    st_audio_setup();
-    st_video_setup(SCREEN_W,SCREEN_H);
-    st_joystick_setup();
-    st_general_setup();
+    Setup::audio();
+    Setup::video(800, 600);
+    Setup::joystick();
+    Setup::general();
     st_menu();
     loadshared();
 
@@ -95,25 +90,15 @@ int main(int argc, char * argv[])
       title();
     }
 
-    SDL_FillRect(screen, 0, 0);
-    //SDL_Flip(screen);
-
     unloadshared();
-    st_general_free();
+    Setup::general_free();
     st_menu_free();
-    TileManager::destroy_instance();
-    #ifdef DEBUG
+#ifdef DEBUG
     Surface::debug_check();
-    #endif
-    st_shutdown();
+#endif
+    Termination::shutdown();
 #ifndef DEBUG  // we want to see the backtrace in gdb when in debug mode
-  }
-  catch (SuperTuxException &e)
-  {
-    std::cerr << "Unhandled SuperTux exception:\n  " << e.what_file() << ":" << e.what_line() << ": " << e.what() << std::endl;
-  }
-  catch (std::exception &e)
-  {
+  } catch (std::exception &e) {
     std:: cerr << "Unhandled exception: " << e.what() << std::endl;
   }
 #endif