capitalized all enums
This commit is contained in:
46
src/cc3k.cc
46
src/cc3k.cc
@ -10,17 +10,17 @@ CC3K::CC3K(const feature enabled_features,
|
||||
out->clear();
|
||||
curr_menu->print(out, rng->get_init_seed());
|
||||
out->render();
|
||||
gresult.status = game_status::main_menu;
|
||||
gresult.status = game_status::MAIN_MENU;
|
||||
}
|
||||
|
||||
game_status CC3K::run() {
|
||||
switch (gresult.status) {
|
||||
case main_menu: {
|
||||
case MAIN_MENU: {
|
||||
auto tmp = curr_menu->run(in);
|
||||
|
||||
if (tmp == -2) {
|
||||
gresult.status = terminated;
|
||||
return terminated;
|
||||
gresult.status = TERMINATED;
|
||||
return TERMINATED;
|
||||
}
|
||||
|
||||
if (tmp != -1) {
|
||||
@ -32,34 +32,34 @@ game_status CC3K::run() {
|
||||
out->clear();
|
||||
curr_game->print();
|
||||
out->render();
|
||||
gresult.status = in_game;
|
||||
return in_game;
|
||||
gresult.status = IN_GAME;
|
||||
return IN_GAME;
|
||||
}
|
||||
|
||||
out->clear();
|
||||
curr_menu->print(out, rng->get_init_seed());
|
||||
out->render();
|
||||
return main_menu;
|
||||
return MAIN_MENU;
|
||||
}
|
||||
|
||||
case in_game: {
|
||||
case IN_GAME: {
|
||||
gresult = curr_game->run();
|
||||
|
||||
if (gresult.status == restart) {
|
||||
if (gresult.status == RESTART) {
|
||||
curr_game.reset();
|
||||
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;
|
||||
} else if (gresult.status == in_game) {
|
||||
gresult.status = MAIN_MENU;
|
||||
return MAIN_MENU;
|
||||
} else if (gresult.status == IN_GAME) {
|
||||
out->clear();
|
||||
curr_game->print();
|
||||
out->render();
|
||||
return in_game;
|
||||
} else if (gresult.status == terminated) {
|
||||
return terminated;
|
||||
return IN_GAME;
|
||||
} else if (gresult.status == TERMINATED) {
|
||||
return TERMINATED;
|
||||
}
|
||||
|
||||
out->clear();
|
||||
@ -68,26 +68,26 @@ game_status CC3K::run() {
|
||||
return gresult.status;
|
||||
}
|
||||
|
||||
case dead:
|
||||
case won:
|
||||
case escaped:
|
||||
case DEAD:
|
||||
case WON:
|
||||
case ESCAPED:
|
||||
curr_game.reset();
|
||||
gresult.run(in);
|
||||
|
||||
if (gresult.status == restart) {
|
||||
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;
|
||||
gresult.status = MAIN_MENU;
|
||||
return MAIN_MENU;
|
||||
}
|
||||
|
||||
return terminated;
|
||||
return TERMINATED;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return terminated;
|
||||
return TERMINATED;
|
||||
}
|
||||
|
Reference in New Issue
Block a user