- moved some more level_ stuff into the levelclass

[supertux.git] / src / supertux.cpp

diff --git a/src/supertux.cpp b/src/supertux.cpp
index 555495a..73991fe 100644 (file)
--- a/src/supertux.cpp
+++ b/src/supertux.cpp
@@ -15,17 +15,13 @@
 
 /* --- MAIN --- */
 
-#ifdef WIN32
-main(int argc, char * argv[])
-#else
 int main(int argc, char * argv[])
-#endif
 {
-  int done;
+  bool done;
   
+  st_directory_setup();
   parseargs(argc, argv);
   
-  st_directory_setup();
   st_audio_setup();
   st_video_setup();
   st_joystick_setup();
@@ -38,14 +34,12 @@ int main(int argc, char * argv[])
     }
   else if (level_startup_file)
     {
-      gameloop(level_startup_file, 1, ST_GL_LOAD_LEVEL_FILE);
+      GameSession session(level_startup_file, 1, ST_GL_LOAD_LEVEL_FILE);
+      session.run();
     }
   else
     {  
-      done = intro();
-  
-      done = 0;
-  
+      done = false;
       while (!done)
         {
           done = title();
@@ -57,5 +51,5 @@ int main(int argc, char * argv[])
 
   st_shutdown();
   
-  return(0);
+  return 0;
 }