#include "title.hpp"
#include "mainloop.hpp"
-#include "video/screen.hpp"
#include "video/drawing_context.hpp"
#include "video/surface.hpp"
#include "audio/sound_manager.hpp"
#include "resources.hpp"
#include "gettext.hpp"
#include "textscroller.hpp"
+#include "fadeout.hpp"
#include "file_system.hpp"
#include "control/joystickkeyboardcontroller.hpp"
#include "control/codecontroller.hpp"
#include "log.hpp"
#include "options_menu.hpp"
#include "console.hpp"
+#include "random_generator.hpp"
enum MainMenuIDs {
MNID_STARTGAME,
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
{
Sector* sector = titlesession->get_current_sector();
sector->deactivate();
+ Menu::set_current(NULL);
}
void
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()) {
stream << "save/" << worlddirname << "_" << slot << ".stsg";
std::string slotfile = stream.str();
- fadeout(256);
-
try {
current_world->set_savegame_filename(slotfile);
current_world->run();