X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsupertux.cpp;h=c29d7f3b7ca9c122832469720245ddf21c964c33;hb=935c2f6a2a27248de63fba86b74a724675761487;hp=facb42a3edcc0ef496111663d294d319a422288c;hpb=42310b31f51a176a6f11ea403a74a6b014b82ab2;p=supertux.git

diff --git a/src/supertux.cpp b/src/supertux.cpp
index facb42a3e..c29d7f3b7 100644
--- a/src/supertux.cpp
+++ b/src/supertux.cpp
@@ -19,58 +19,104 @@
 //  02111-1307, USA.
 
 #include <sys/types.h>
-#include <ctype.h>
+#include <cctype>
+#include <iostream>
+#include <exception>
 
+#include "utils/exceptions.h"
 #include "defines.h"
-#include "globals.h"
-#include "setup.h"
+#include "app/globals.h"
+#include "app/setup.h"
 #include "intro.h"
 #include "title.h"
 #include "gameloop.h"
 #include "leveleditor.h"
-#include "screen.h"
+#include "video/screen.h"
 #include "worldmap.h"
 #include "resources.h"
-#include "texture.h"
-#include "tile.h"
+#include "video/surface.h"
+#include "tile_manager.h"
+#include "app/gettext.h"
+#include "player.h"
+#include "misc.h"
+#include "utils/configfile.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
+    config = new MyConfig;
+    setlocale(LC_ALL, "");
+    bindtextdomain(PACKAGE, LOCALEDIR);
+    textdomain(PACKAGE);
+    bind_textdomain_codeset(PACKAGE, "ISO-8859-1");
+    
+    Setup::info(PACKAGE_NAME,PACKAGE,PACKAGE_VERSION);  
+    
+    Setup::directories();
+    Setup::parseargs(argc, argv);
+
+    Setup::audio();
+    Setup::video(SCREEN_W,SCREEN_H);
+    Setup::joystick();
+    Setup::general();
+    st_menu();
+    loadshared();
+
+    if (launch_leveleditor_mode)
+    {
+      LevelEditor leveleditor;
 
-  if (launch_worldmap_mode)
+      if(level_startup_file)
+        leveleditor.run(level_startup_file);
+      else
+        leveleditor.run();
+    }
+    else if (launch_worldmap_mode && level_startup_file)
     {
+      // hack to make it possible for someone to give an absolute path
+      std::string str(level_startup_file);
+      unsigned int i = str.find_last_of("/", str.size());
+      if(i != std::string::npos)
+        str.erase(0, i+1);
+
       WorldMapNS::WorldMap worldmap;
+      worldmap.loadmap(str);
       worldmap.display();
     }
-  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();
-  st_general_free();
-  TileManager::destroy_instance();
-#ifdef DEBUG
-  Surface::debug_check();
+    SDL_FillRect(screen, 0, 0);
+    //SDL_Flip(screen);
+
+    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;
+  }
 #endif
-  st_shutdown();
-  
+
   return 0;
 }