Don't show "by", in case the author name is blank.

[supertux.git] / src / supertux.cpp

diff --git a/src/supertux.cpp b/src/supertux.cpp
index ce71bc9..588639a 100644 (file)
--- a/src/supertux.cpp
+++ b/src/supertux.cpp
@@ -19,8 +19,11 @@
 //  02111-1307, USA.
 
 #include <sys/types.h>
-#include <ctype.h>
+#include <cctype>
+#include <iostream>
+#include <exception>
 
+#include "exceptions.h"
 #include "defines.h"
 #include "globals.h"
 #include "setup.h"
@@ -28,48 +31,69 @@
 #include "title.h"
 #include "gameloop.h"
 #include "leveleditor.h"
-#include "screen.h"
+#include "screen/screen.h"
 #include "worldmap.h"
 #include "resources.h"
-#include "texture.h"
-#include "tile.h"
+#include "screen/surface.h"
+#include "tile_manager.h"
+#include "gettext.h"
 
 int main(int argc, char * argv[])
 {
-  st_directory_setup();
-  parseargs(argc, argv);
-  
-  st_audio_setup();
-  st_video_setup();
-  st_joystick_setup();
-  st_general_setup();
-  st_menu();
-  loadshared();
+#ifndef DEBUG
+  try {
+#endif
+    setlocale(LC_ALL, "");
+    bindtextdomain(PACKAGE, LOCALEDIR);
+    textdomain(PACKAGE);
+    bind_textdomain_codeset(PACKAGE, "ISO-8859-1");
+      
+    st_directory_setup();
+    parseargs(argc, argv);
+
+    st_audio_setup();
+    st_video_setup();
+    st_joystick_setup();
+    st_general_setup();
+    st_menu();
+    loadshared();
 
-  if (launch_worldmap_mode)
+    if (launch_leveleditor_mode && level_startup_file)
     {
-      WorldMapNS::WorldMap worldmap;
-      worldmap.display();
+      // TODO
+      // leveleditor(level_startup_file);
     }
-  else if (level_startup_file)
+    else if (level_startup_file)
     {
-      GameSession session(level_startup_file, 1, ST_GL_LOAD_LEVEL_FILE);
+      GameSession session(level_startup_file, ST_GL_LOAD_LEVEL_FILE);
       session.run();
     }
-  else
+    else
     {  
       title();
     }
-  
-  clearscreen(0, 0, 0);
-  updatescreen();
 
-  unloadshared();
-  TileManager::destroy_instance();
-#ifdef DEBUG
-  Surface::debug_check();
+    SDL_FillRect(screen, 0, 0);
+    //SDL_Flip(screen);
+
+    unloadshared();
+    st_general_free();
+    TileManager::destroy_instance();
+    #ifdef DEBUG
+    Surface::debug_check();
+    #endif
+    st_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;
+  }
 #endif
-  st_shutdown();
-  
+
   return 0;
 }