X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsupertux.cpp;h=81856f6e638e6778afad4a15a3e975ca94e42fe5;hb=6f988a2dfbe4de1096a5ca6a4b30e7fc5355316c;hp=088222ff26b03ccccd37bdcaf0776e25ec4abfe0;hpb=d46c78c842ab4090a3f46e560c891234167f124b;p=supertux.git

diff --git a/src/supertux.cpp b/src/supertux.cpp
index 088222ff2..81856f6e6 100644
--- a/src/supertux.cpp
+++ b/src/supertux.cpp
@@ -23,8 +23,8 @@
 #include <cctype>
 #include <iostream>
 #include <exception>
+#include <locale.h>
 
-#include "utils/exceptions.h"
 #include "defines.h"
 #include "app/globals.h"
 #include "app/setup.h"
@@ -38,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"
 
@@ -48,14 +47,9 @@ int main(int argc, char * argv[])
   try {
 #endif
     config = new MyConfig;
-    setlocale(LC_ALL, "");
-    (void) bindtextdomain(PACKAGE, LOCALEDIR);
-    (void) textdomain(PACKAGE);
-    (void) bind_textdomain_codeset(PACKAGE, "ISO-8859-1");
+   
+    Setup::init(PACKAGE_NAME, PACKAGE_NAME, PACKAGE_VERSION);
     
-    Setup::info(PACKAGE_NAME, PACKAGE, PACKAGE_VERSION);  
-    
-    Setup::directories();
     Setup::parseargs(argc, argv);
 
     Setup::audio();
@@ -99,14 +93,11 @@ int main(int argc, char * argv[])
     unloadshared();
     Setup::general_free();
     st_menu_free();
-    TileManager::destroy_instance();
 #ifdef DEBUG
     Surface::debug_check();
 #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) {
     std:: cerr << "Unhandled exception: " << e.what() << std::endl;
   }