if (dir != NONE)
{
tux->set_direction(dir);
- tux->update(delta);
+ //tux->update(delta);
}
std::cout << "Walk to dir: " << dir << std::endl;
}
if (!level->extro_filename.empty())
- { // Display final credits and go back to the main menu
+ {
+ MusicRef theme =
+ music_manager->load_music(datadir + "/music/theme.mod");
+ music_manager->play_music(theme);
+ // Display final credits and go back to the main menu
display_text_file(level->extro_filename,
- "/images/background/arctis2.jpg");
+ "/images/background/extro.jpg", SCROLL_SPEED_MESSAGE);
+ display_text_file("CREDITS",
+ "/images/background/oiltux.jpg", SCROLL_SPEED_CREDITS);
quit = true;
}
}
break;
case GameSession::GAME_OVER:
quit = true;
- player_status.bonus = PlayerStatus::NO_BONUS;
+ player_status.reset();
break;
case GameSession::NONE:
// Should never be reached
}
else
{
- tux->set_direction(input_direction);
tux->update(delta);
+ tux->set_direction(input_direction);
}
Menu* menu = Menu::current();
{
case MNID_RETURNWORLDMAP: // Return to game
break;
- case MNID_SAVEGAME:
- if (!savegame_file.empty())
- savegame(savegame_file);
- break;
-
case MNID_QUITWORLDMAP: // Quit Worldmap
quit = true;
break;
if (player_status.lives >= 5)
{
sprintf(str, "%dx", player_status.lives);
- gold_text->draw(str, 585, 0);
+ gold_text->draw_align(str, 617, 0, A_RIGHT, A_TOP);
tux_life->draw(565+(18*3), 0);
}
else
delta *= 1.3f;
+ if (delta > 10.0f)
+ delta = .3f;
+
last_update_time = update_time;
update_time = st_get_ticks();