fix cr/lfs and remove trailing whitespaces...

[supertux.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index c082224..fabccdd 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -86,7 +86,7 @@ static void init_physfs(const char* argv0)
 
   // Initialize physfs (this is a slightly modified version of
   // PHYSFS_setSaneConfig
-  const char* application = PACKAGE_NAME;
+  const char* application = "supertux2"; //instead of PACKAGE_NAME so we can coexist with MS1
   const char* userdir = PHYSFS_getUserDir();
   const char* dirsep = PHYSFS_getDirSeparator();
   char* writedir = new char[strlen(userdir) + strlen(application) + 2];
@@ -99,17 +99,17 @@ static void init_physfs(const char* argv0)
     sprintf(mkdir, ".%s", application);
     if(!PHYSFS_setWriteDir(userdir) || !PHYSFS_mkdir(mkdir)) {
       std::ostringstream msg;
-      msg << "Failed creating configuration directory '" 
+      msg << "Failed creating configuration directory '"
           << writedir << "': " << PHYSFS_getLastError();
       delete[] writedir;
       delete[] mkdir;
       throw std::runtime_error(msg.str());
     }
     delete[] mkdir;
-    
+
     if(!PHYSFS_setWriteDir(writedir)) {
       std::ostringstream msg;
-      msg << "Failed to use configuration directory '" 
+      msg << "Failed to use configuration directory '"
           <<  writedir << "': " << PHYSFS_getLastError();
       delete[] writedir;
       throw std::runtime_error(msg.str());
@@ -136,7 +136,7 @@ static void init_physfs(const char* argv0)
       }
     }
   }
-  
+
   PHYSFS_freeList(rc);
 
   // when started from source dir...
@@ -302,12 +302,12 @@ void init_video()
 {
   if(texture_manager != NULL)
     texture_manager->save_textures();
-  
-  SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); 
+
+  SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
   SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
   SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
   SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
-  
+
   int flags = SDL_OPENGL;
   if(config->use_fullscreen)
     flags |= SDL_FULLSCREEN;
@@ -365,7 +365,7 @@ void init_video()
 static void init_audio()
 {
   sound_manager = new SoundManager();
-  
+
   sound_manager->enable_sound(config->sound_enabled);
   sound_manager->enable_music(config->music_enabled);
 }
@@ -381,7 +381,7 @@ static void quit_audio()
 void wait_for_event(float min_delay, float max_delay)
 {
   assert(min_delay <= max_delay);
-  
+
   Uint32 min = (Uint32) (min_delay * 1000);
   Uint32 max = (Uint32) (max_delay * 1000);
 
@@ -425,7 +425,7 @@ static const char* last_timelog_component = 0;
 static inline void timelog(const char* component)
 {
   Uint32 current_ticks = SDL_GetTicks();
-  
+
   if(last_timelog_component != 0) {
     log_info << "Component '" << last_timelog_component <<  "' finished after " << (current_ticks - last_timelog_ticks) / 1000.0 << " seconds" << std::endl;
   }
@@ -439,18 +439,17 @@ static inline void timelog(const char* )
 }
 #endif
 
-int main(int argc, char** argv) 
+int main(int argc, char** argv)
 {
   int result = 0;
-    
+
   try {
     Console::instance = new Console();
-//  srand(time(0));            // this breaks repeatability in random numbers
     init_physfs(argv[0]);
     init_sdl();
-    
+
     timelog("controller");
-    main_controller = new JoystickKeyboardController();    
+    main_controller = new JoystickKeyboardController();
     timelog("config");
     init_config();
     timelog("tinygettext");
@@ -462,29 +461,34 @@ int main(int argc, char** argv)
     init_audio();
     timelog("video");
     init_video();
-    Console::instance->init_graphics(); 
+    Console::instance->init_graphics();
     timelog("scripting");
     Scripting::init_squirrel(config->enable_script_debugger);
     timelog("resources");
-    load_shared(); 
+    load_shared();
     timelog(0);
 
-    main_loop = new MainLoop(); 
+    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);
 
-      init_rand();        // play_demo sets seed, record_demo uses it
-
       if(config->start_level.size() > 4 &&
-              config->start_level.compare(config->start_level.size() - 5, 4, ".stwm") == 0) {
-          main_loop->push_screen(new WorldMapNS::WorldMap(config->start_level));
+              config->start_level.compare(config->start_level.size() - 5, 5, ".stwm") == 0) {
+          init_rand();
+          main_loop->push_screen(new WorldMapNS::WorldMap(
+                      FileSystem::basename(config->start_level)));
       } else {
+        init_rand();//If level uses random eg. for
+        // rain particles before we do this:
         std::auto_ptr<GameSession> session (
                 new GameSession(FileSystem::basename(config->start_level)));
-        
+
+        config->random_seed =session->get_demo_random_seed(config->start_demo);
+        init_rand();//initialise generator with seed from session
+
         if(config->start_demo != "")
           session->play_demo(config->start_demo);
 
@@ -497,6 +501,7 @@ int main(int argc, char** argv)
       main_loop->push_screen(new TitleScreen());
     }
 
+    //init_rand(); PAK: this call might subsume the above 3, but I'm chicken!
     main_loop->run();
 
   } catch(std::exception& e) {
@@ -527,6 +532,6 @@ int main(int argc, char** argv)
   texture_manager = NULL;
   SDL_Quit();
   PHYSFS_deinit();
-  
+
   return result;
 }