X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsupertux.cpp;h=46efc59ee861084bb1e8c5fe670377cc994c40e6;hb=3ca25f16f12442ad698973cf3e282ae6a7f664c9;hp=dc771dfb185528596ca4e59b219d2810010d6b4f;hpb=3fc1f424aabbb9aad5f21b5eb4564fdc5418517c;p=supertux.git

diff --git a/src/supertux.cpp b/src/supertux.cpp
index dc771dfb1..46efc59ee 100644
--- a/src/supertux.cpp
+++ b/src/supertux.cpp
@@ -25,10 +25,8 @@
 #include <exception>
 #include <locale.h>
 
-#include "defines.h"
 #include "app/globals.h"
 #include "app/setup.h"
-#include "intro.h"
 #include "title.h"
 #include "gameloop.h"
 #include "leveleditor.h"
@@ -53,7 +51,7 @@ int main(int argc, char * argv[])
     Setup::parseargs(argc, argv);
 
     Setup::audio();
-    Setup::video(800, 600);
+    Setup::video(screen_width, screen_height);
     Setup::joystick();
     Setup::general();
     st_menu();
@@ -98,8 +96,6 @@ int main(int argc, char * argv[])
 #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;
   }