#include "log.hpp"
#include "options_menu.hpp"
#include "console.hpp"
+#include "random_generator.hpp"
enum MainMenuIDs {
MNID_STARTGAME,
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;
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) {
new GameSession(current_world->get_level_filename(index));
main_loop->push_screen(session);
}
- }
+ }
}
void
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_space(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
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());
}
{
Sector* sector = titlesession->get_current_sector();
sector->deactivate();
+ Menu::set_current(NULL);
}
void
{
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,
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:
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;
return true;
}
-