added result screens
fixed bug about picking up two boosts crashing the game
This commit is contained in:
15
src/cc3k.cc
15
src/cc3k.cc
@ -24,7 +24,7 @@ game_status CC3K::run() {
|
||||
}
|
||||
|
||||
if (tmp != -1) {
|
||||
curr_menu = nullptr;
|
||||
curr_menu.reset();
|
||||
curr_game = std::make_unique<game>((race)tmp,
|
||||
enabled_features,
|
||||
in, out, rng);
|
||||
@ -45,7 +45,7 @@ game_status CC3K::run() {
|
||||
gresult = curr_game->run();
|
||||
|
||||
if (gresult.status == restart) {
|
||||
curr_game = nullptr;
|
||||
curr_game.reset();
|
||||
curr_menu = std::make_unique<menu>(enabled_features);
|
||||
out->clear();
|
||||
curr_menu->print(out, rng->get_init_seed());
|
||||
@ -70,7 +70,18 @@ game_status CC3K::run() {
|
||||
case dead:
|
||||
case won:
|
||||
case escaped:
|
||||
curr_game.reset();
|
||||
gresult.run(in);
|
||||
|
||||
if (gresult.status == restart) {
|
||||
curr_menu = std::make_unique<menu>(enabled_features);
|
||||
out->clear();
|
||||
curr_menu->print(out, rng->get_init_seed());
|
||||
out->render();
|
||||
gresult.status = main_menu;
|
||||
return main_menu;
|
||||
}
|
||||
|
||||
return terminated;
|
||||
|
||||
default:
|
||||
|
Reference in New Issue
Block a user