updating Nolok contrib templates

[supertux.git] / src / supertux.cpp

diff --git a/src/supertux.cpp b/src/supertux.cpp
index 2c60c0e..46efc59 100644 (file)
--- a/src/supertux.cpp
+++ b/src/supertux.cpp
@@ -25,11 +25,8 @@
 #include <exception>
 #include <locale.h>
 
-#include "utils/exceptions.h"
-#include "defines.h"
 #include "app/globals.h"
 #include "app/setup.h"
-#include "intro.h"
 #include "title.h"
 #include "gameloop.h"
 #include "leveleditor.h"
@@ -39,7 +36,6 @@
 #include "video/surface.h"
 #include "tile_manager.h"
 #include "app/gettext.h"
-#include "player.h"
 #include "misc.h"
 #include "utils/configfile.h"
 
@@ -50,12 +46,12 @@ int main(int argc, char * argv[])
 #endif
     config = new MyConfig;
    
-    Setup::init(PACKAGE_NAME, PACKAGE, PACKAGE_VERSION);  
+    Setup::init(PACKAGE_NAME, PACKAGE_NAME, PACKAGE_VERSION);
     
     Setup::parseargs(argc, argv);
 
     Setup::audio();
-    Setup::video(800, 600);
+    Setup::video(screen_width, screen_height);
     Setup::joystick();
     Setup::general();
     st_menu();
@@ -95,14 +91,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;
   }