Subtle animation of Console background /

[supertux.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 0adba32..2bfbed2 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,10 +20,10 @@
 #include <config.h>
 #include <assert.h>
 
+#include "msg.hpp"
 #include "main.hpp"
 
 #include <stdexcept>
-#include <iostream>
 #include <sstream>
 #include <time.h>
 #include <stdlib.h>
@@ -45,6 +45,7 @@
 #include "video/texture_manager.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
 #include "misc.hpp"
+#include "mainloop.hpp"
 #include "title.hpp"
 #include "game_session.hpp"
 #include "file_system.hpp"
@@ -61,8 +62,7 @@ static void init_config()
   try {
     config->load();
   } catch(std::exception& e) {
-    std::cerr << "Couldn't load config file: " << e.what() << "\n";
-    std::cerr << "Using default settings.\n";
+    msg_info << "Couldn't load config file: " << e.what() << ", using default settings" << std::endl;
   }
 }
 
@@ -145,8 +145,7 @@ static void init_physfs(const char* argv0)
   if(f) {
     fclose(f);
     if(!PHYSFS_addToSearchPath(dir.c_str(), 1)) {
-      std::cout << "Warning: Couldn't add '" << dir 
-                << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n";
+      msg_warning << "Couldn't add '" << dir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
     } else {
       sourcedir = true;
     }
@@ -163,8 +162,7 @@ static void init_physfs(const char* argv0)
     datadir = APPDATADIR;
 #endif
     if(!PHYSFS_addToSearchPath(datadir.c_str(), 1)) {
-      std::cout << "Couldn't add '" << datadir
-        << "' to physfs searchpath: " << PHYSFS_getLastError() << "\n";
+      msg_warning << "Couldn't add '" << datadir << "' to physfs searchpath: " << PHYSFS_getLastError() << std::endl;
     }
 #endif
   }
@@ -174,7 +172,7 @@ static void init_physfs(const char* argv0)
 
   //show search Path
   for(char** i = PHYSFS_getSearchPath(); *i != NULL; i++)
-    printf("[%s] is in the search path.\n", *i);
+    msg_info << "[" << *i << "] is in the search path" << std::endl;
 }
 
 static void print_usage(const char* argv0)
@@ -236,13 +234,12 @@ static void parse_commandline(int argc, char** argv)
       print_usage(argv[0]);
       throw graceful_shutdown();
     } else if(arg == "--version") {
-      std::cerr << PACKAGE_NAME << " " << PACKAGE_VERSION << "\n";
+      msg_info << PACKAGE_NAME << " " << PACKAGE_VERSION << std::endl;
       throw graceful_shutdown();
     } else if(arg[0] != '-') {
       config->start_level = arg;
     } else {
-      std::cerr << "Unknown option '" << arg << "'.\n";
-      std::cerr << "Use --help to see a list of options.\n";
+      msg_warning << "Unknown option '" << arg << "'. Use --help to see a list of options" << std::endl;
     }
   }
 
@@ -341,7 +338,7 @@ void init_video()
   }
 #ifdef DEBUG
   else {
-    std::cerr << "Warning: Couldn't find icon 'images/engine/icons/supertux.xpm'.\n";
+    msg_warning << "Couldn't find icon 'images/engine/icons/supertux.xpm'" << std::endl;
   }
 #endif
 
@@ -433,8 +430,7 @@ static inline void timelog(const char* component)
   Uint32 current_ticks = SDL_GetTicks();
   
   if(last_timelog_component != 0) {
-    printf("Component '%s' finished after %f seconds\n",
-        last_timelog_component, (current_ticks - last_timelog_ticks) / 1000.0);
+    msg_info << "Component '" << last_timelog_component <<  "' finished after " << (current_ticks - last_timelog_ticks) / 1000.0 << " seconds" << std::endl;
   }
 
   last_timelog_ticks = current_ticks;
@@ -470,28 +466,35 @@ int main(int argc, char** argv)
     timelog("resources");
     load_shared();
     timelog(0);
+
+    main_loop = new MainLoop(); 
     if(config->start_level != "") {
       // we have a normal path specified at commandline not physfs paths.
       // So we simply mount that path here...
       std::string dir = FileSystem::dirname(config->start_level);
       PHYSFS_addToSearchPath(dir.c_str(), true);
-      GameSession session(
+      GameSession* session
+        = new GameSession(
           FileSystem::basename(config->start_level), ST_GL_LOAD_LEVEL_FILE);
       if(config->start_demo != "")
-        session.play_demo(config->start_demo);
+        session->play_demo(config->start_demo);
       if(config->record_demo != "")
-        session.record_demo(config->record_demo);
-      session.run();
+        session->record_demo(config->record_demo);
+      main_loop->push_screen(session);
     } else {
-      // normal game
-      title();
+      main_loop->push_screen(new TitleScreen());
     }
+
+    main_loop->run();
+
+    delete main_loop;
+    main_loop = NULL;
   } catch(graceful_shutdown& e) {
   } catch(std::exception& e) {
-    std::cerr << "Unexpected exception: " << e.what() << std::endl;
+    msg_fatal << "Unexpected exception: " << e.what() << std::endl;
     return 1;
   } catch(...) {
-    std::cerr << "Unexpected exception." << std::endl;
+    msg_fatal << "Unexpected exception" << std::endl;
     return 1;
   }