X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=08259e870fd0e4d460f7fb07c1dbb23fddddd2aa;hb=8372bc7834408184195e060a3f9bfef90b2365b6;hp=da22b4936f684be408cedc76857b012e5ed4e3c9;hpb=fc73efa7ff699fe3c9c237845b6f4fda0d999862;p=supertux.git

diff --git a/src/title.cpp b/src/title.cpp
index da22b4936..08259e870 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -35,7 +35,6 @@
 
 #include "title.hpp"
 #include "mainloop.hpp"
-#include "video/screen.hpp"
 #include "video/drawing_context.hpp"
 #include "video/surface.hpp"
 #include "audio/sound_manager.hpp"
@@ -56,6 +55,7 @@
 #include "resources.hpp"
 #include "gettext.hpp"
 #include "textscroller.hpp"
+#include "fadeout.hpp"
 #include "file_system.hpp"
 #include "control/joystickkeyboardcontroller.hpp"
 #include "control/codecontroller.hpp"
@@ -63,6 +63,7 @@
 #include "log.hpp"
 #include "options_menu.hpp"
 #include "console.hpp"
+#include "random_generator.hpp"
 
 enum MainMenuIDs {
   MNID_STARTGAME,
@@ -101,7 +102,7 @@ void
 TitleScreen::generate_contrib_menu()
 {
   /** Generating contrib levels list by making use of Level Subset  */
-  std::vector<std::string> level_worlds; 
+  std::vector<std::string> level_worlds;
   char** files = PHYSFS_enumerateFiles("levels/");
   for(const char* const* filename = files; *filename != 0; ++filename) {
     std::string filepath = std::string("levels/") + *filename;
@@ -115,7 +116,7 @@ TitleScreen::generate_contrib_menu()
 
   contrib_menu->add_label(_("Contrib Levels"));
   contrib_menu->add_hl();
-  
+
   int i = 0;
   for (std::vector<std::string>::iterator it = level_worlds.begin();
       it != level_worlds.end(); ++it) {
@@ -202,7 +203,7 @@ TitleScreen::check_contrib_world_menu()
         new GameSession(current_world->get_level_filename(index));
       main_loop->push_screen(session);
     }
-  }  
+  }
 }
 
 void
@@ -222,26 +223,26 @@ TitleScreen::make_tux_jump()
   controller->press(Controller::RIGHT);
 
   // Determine how far we moved since last frame
-  float dx = fabsf(last_tux_x_pos - tux->get_pos().x); 
-  float dy = fabsf(last_tux_y_pos - tux->get_pos().y); 
- 
-  // Calculate space to check for obstacles 
+  float dx = fabsf(last_tux_x_pos - tux->get_pos().x);
+  float dy = fabsf(last_tux_y_pos - tux->get_pos().y);
+
+  // Calculate space to check for obstacles
   Rect lookahead = tux->get_bbox();
   lookahead.move(Vector(96, 0));
-  
+
   // Check if we should press the jump button
   bool randomJump = !randomWaitTimer.started();
   bool notMoving = (fabsf(dx) + fabsf(dy)) < 0.1;
-  bool pathBlocked = !sector->is_free_space(lookahead); 
+  bool pathBlocked = !sector->is_free_of_statics(lookahead);
   if (!controller->released(Controller::JUMP)
       && (notMoving || pathBlocked || randomJump)) {
     float jumpDuration;
     if(pathBlocked)
       jumpDuration = 0.5;
     else
-      jumpDuration = float(rand() % 500 + 300) / 1000.0;
+      jumpDuration = systemRandom.randf(0.3, 0.8);
     jumpPushTimer.start(jumpDuration);
-    randomWaitTimer.start(float(rand() % 3000 + 3000) / 1000.0);
+    randomWaitTimer.start(systemRandom.randf(3.0, 6.0));
   }
 
   // Keep jump button pressed
@@ -253,7 +254,7 @@ TitleScreen::make_tux_jump()
   last_tux_y_pos = tux->get_pos().y;
 
   // Wrap around at the end of the level back to the beginnig
-  if(sector->solids->get_width() * 32 - 320 < tux->get_pos().x) {
+  if(sector->get_width() - 320 < tux->get_pos().x) {
     sector->activate("main");
     sector->camera->reset(tux->get_pos());
   }
@@ -299,6 +300,7 @@ TitleScreen::leave()
 {
   Sector* sector = titlesession->get_current_sector();
   sector->deactivate();
+  Menu::set_current(NULL);
 }
 
 void
@@ -306,7 +308,7 @@ TitleScreen::draw(DrawingContext& context)
 {
   Sector* sector  = titlesession->get_current_sector();
   sector->draw(context);
- 
+
   context.draw_text(white_small_text, " SuperTux " PACKAGE_VERSION "\n",
       Vector(0, SCREEN_HEIGHT - 50), LEFT_ALLIGN, LAYER_FOREGROUND1);
   context.draw_text(white_small_text,
@@ -327,11 +329,11 @@ TitleScreen::update(float elapsed_time)
   sector->update(elapsed_time);
 
   make_tux_jump();
-  
+
   Menu* menu = Menu::current();
   if(menu) {
     menu->update();
-  	  
+
     if(menu == main_menu.get()) {
       switch (main_menu->check()) {
         case MNID_STARTGAME:
@@ -350,11 +352,11 @@ TitleScreen::update(float elapsed_time)
           Menu::push_current(contrib_menu.get());
           break;
         case MNID_CREDITS:
-          fadeout(500);
-          main_loop->push_screen(new TextScroller("credits.txt"));
+          main_loop->push_screen(new TextScroller("credits.txt"),
+                                 new FadeOut(0.5));
           break;
         case MNID_QUITMAINMENU:
-          main_loop->quit();
+          main_loop->quit(new FadeOut(0.25));
           break;
       }
     } else if(menu == load_game_menu.get()) {
@@ -364,7 +366,7 @@ TitleScreen::update(float elapsed_time)
         std::stringstream stream;
         stream << slot;
         std::string str = _("Are you sure you want to delete slot") + stream.str() + "?";
-        
+
         if(confirm_dialog(bkg_title, str.c_str())) {
           str = "save/slot" + stream.str() + ".stsg";
           log_debug << "Removing: " << str << std::endl;
@@ -440,8 +442,6 @@ TitleScreen::process_load_game_menu()
   stream << "save/" << worlddirname << "_" << slot << ".stsg";
   std::string slotfile = stream.str();
 
-  fadeout(256);
-
   try {
     current_world->set_savegame_filename(slotfile);
     current_world->run();
@@ -451,4 +451,3 @@ TitleScreen::process_load_game_menu()
 
   return true;
 }
-