X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsupertux.cpp;h=23a3fcf214eaa89a8b21e8576a2216f09e8b7e68;hb=5a542dea3c6043703683b68fcaa774f6cb0d9127;hp=8cbc3bee620047154e3c56f51605ffada8a643de;hpb=4470a62f57e69550e4f590c4d2622b55ba6c089c;p=supertux.git

diff --git a/src/supertux.cpp b/src/supertux.cpp
index 8cbc3bee6..23a3fcf21 100644
--- a/src/supertux.cpp
+++ b/src/supertux.cpp
@@ -17,47 +17,74 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
+#include <config.h>
 
 #include <sys/types.h>
-#include <ctype.h>
+#include <cctype>
 #include <iostream>
-
 #include <exception>
-#include "exceptions.h"
+#include <locale.h>
 
+#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[])
 {
+#ifndef DEBUG
   try {
-    st_directory_setup();
-    parseargs(argc, argv);
+#endif
+    config = new MyConfig;
+   
+    Setup::init(PACKAGE_NAME, PACKAGE_NAME, PACKAGE_VERSION);
+    
+    Setup::parseargs(argc, argv);
 
-    st_audio_setup();
-    st_video_setup();
-    st_joystick_setup();
-    st_general_setup();
+    Setup::audio();
+    Setup::video(800, 600);
+    Setup::joystick();
+    Setup::general();
     st_menu();
     loadshared();
 
-    if (launch_leveleditor_mode && level_startup_file)
+    if (launch_leveleditor_mode)
+    {
+      LevelEditor leveleditor;
+
+      if(level_startup_file)
+        leveleditor.run(level_startup_file);
+      else
+        leveleditor.run();
+    }
+    else if (launch_worldmap_mode && level_startup_file)
     {
-    leveleditor(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)
     {
-      GameSession session(level_startup_file, 1, ST_GL_LOAD_LEVEL_FILE);
+      GameSession session(level_startup_file, ST_GL_LOAD_LEVEL_FILE);
       session.run();
     }
     else
@@ -65,25 +92,21 @@ int main(int argc, char * argv[])
       title();
     }
 
-    clearscreen(0, 0, 0);
-    updatescreen();
-
     unloadshared();
-    st_general_free();
+    Setup::general_free();
+    st_menu_free();
     TileManager::destroy_instance();
-    #ifdef DEBUG
+#ifdef DEBUG
     Surface::debug_check();
-    #endif
-    st_shutdown();
-  }
-  catch (SuperTuxException &e)
-  {
+#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)
-  {
+  } catch (std::exception &e) {
     std:: cerr << "Unhandled exception: " << e.what() << std::endl;
   }
+#endif
 
   return 0;
 }