capitalized all enums
This commit is contained in:
36
src/menu.cc
36
src/menu.cc
@ -7,8 +7,8 @@ const int EXTRA_CNT = 10;
|
||||
const int HOR_INCRM = 5;
|
||||
|
||||
const enum race RACES[EXTRA_CNT] = {
|
||||
rshade, rdrow, rgoblin, rvampire, rtroll,
|
||||
rmonk, rassassin, rmr_goose, rbrawler, rt_800
|
||||
SHADE, DROW, GOBLIN, VAMPIRE, TROLL,
|
||||
MONK, ASSASSIN, MR_GOOSE, BRAWLER, RT_800
|
||||
};
|
||||
|
||||
const position RACE_POS[EXTRA_CNT] = {
|
||||
@ -81,53 +81,53 @@ int menu::run(input *in) {
|
||||
auto cmd = in->get_command();
|
||||
|
||||
switch (cmd) {
|
||||
case game_command::enter:
|
||||
case game_command::ENTER:
|
||||
return RACES[curr];
|
||||
|
||||
case move_north: {
|
||||
case MOVE_NORTH: {
|
||||
if (curr > 0)
|
||||
--curr;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case move_south: {
|
||||
case MOVE_SOUTH: {
|
||||
if (curr < limit - 1)
|
||||
++curr;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case move_east: {
|
||||
case MOVE_EAST: {
|
||||
if (curr + HOR_INCRM < limit)
|
||||
curr += HOR_INCRM;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case move_west: {
|
||||
case MOVE_WEAT: {
|
||||
if (curr - HOR_INCRM >= 0)
|
||||
curr -= HOR_INCRM;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
case select_shade:
|
||||
return rshade;
|
||||
case SELECT_SHADE:
|
||||
return SHADE;
|
||||
|
||||
case select_drow:
|
||||
return rdrow;
|
||||
case SELECT_DROW:
|
||||
return DROW;
|
||||
|
||||
case select_goblin:
|
||||
return rgoblin;
|
||||
case SELECT_GOBLIN:
|
||||
return GOBLIN;
|
||||
|
||||
case select_troll:
|
||||
return rtroll;
|
||||
case SELECT_TROLL:
|
||||
return TROLL;
|
||||
|
||||
case select_vampire:
|
||||
return rvampire;
|
||||
case SELECT_VAMPIRE:
|
||||
return VAMPIRE;
|
||||
|
||||
case game_command_terminate:
|
||||
case GAME_COMMAND_TERMINATE:
|
||||
return -2;
|
||||
|
||||
default:
|
||||
|
Reference in New Issue
Block a user