capitalized all enums
This commit is contained in:
@ -10,98 +10,98 @@ game_command curses_input::get_command() {
|
||||
|
||||
switch (curse->getcmd()) {
|
||||
case 'h':
|
||||
return game_command::move_west;
|
||||
return game_command::MOVE_WEAT;
|
||||
|
||||
case 'j':
|
||||
return game_command::move_south;
|
||||
return game_command::MOVE_SOUTH;
|
||||
|
||||
case 'k':
|
||||
return game_command::move_north;
|
||||
return game_command::MOVE_NORTH;
|
||||
|
||||
case 'l':
|
||||
return game_command::move_east;
|
||||
return game_command::MOVE_EAST;
|
||||
|
||||
case 'y':
|
||||
return game_command::move_northwest;
|
||||
return game_command::MOVE_NORTHWEST;
|
||||
|
||||
case 'u':
|
||||
return game_command::move_northeast;
|
||||
return game_command::MOVE_NORTHEAST;
|
||||
|
||||
case 'b':
|
||||
return game_command::move_southwest;
|
||||
return game_command::MOVE_SOUTHWEST;
|
||||
|
||||
case 'n':
|
||||
return game_command::move_southeast;
|
||||
return game_command::MOVE_SOUTHEAST;
|
||||
|
||||
case 'a':
|
||||
tmp = apply_north;
|
||||
tmp = APPLY_NORTH;
|
||||
break; // wait for another command
|
||||
|
||||
case '<':
|
||||
return game_command::up_stairs;
|
||||
return game_command::UP_STAIRS;
|
||||
|
||||
case '>':
|
||||
return game_command::down_stairs;
|
||||
return game_command::DOWN_STAIRS;
|
||||
|
||||
case 'q':
|
||||
return game_command_terminate;
|
||||
return GAME_COMMAND_TERMINATE;
|
||||
|
||||
case 'f':
|
||||
return game_command::the_world;
|
||||
return game_command::THE_WORLD;
|
||||
|
||||
case 'r':
|
||||
return game_restart;
|
||||
return GAME_RESTART;
|
||||
|
||||
case 'e':
|
||||
return game_command::enter;
|
||||
return game_command::ENTER;
|
||||
|
||||
case 'i':
|
||||
return toggle_inventory;
|
||||
return TOGGLE_INVENTORY;
|
||||
|
||||
case 't':
|
||||
tmp = throw_north;
|
||||
tmp = THROW_NORTH;
|
||||
break;
|
||||
|
||||
default:
|
||||
return game_command_pass;
|
||||
return GAME_COMMAND_PASS;
|
||||
}
|
||||
|
||||
switch (curse->getcmd()) {
|
||||
case 'h':
|
||||
return static_cast<game_command>
|
||||
(tmp + west);
|
||||
(tmp + WEST);
|
||||
|
||||
case 'j':
|
||||
return static_cast<game_command>
|
||||
(tmp + south);
|
||||
(tmp + SOUTH);
|
||||
|
||||
case 'k':
|
||||
return static_cast<game_command>
|
||||
(tmp + north);
|
||||
(tmp + NORTH);
|
||||
|
||||
case 'l':
|
||||
return static_cast<game_command>
|
||||
(tmp + east);
|
||||
(tmp + EAST);
|
||||
|
||||
case 'y':
|
||||
return static_cast<game_command>
|
||||
(tmp + northwest);
|
||||
(tmp + NORTHWEST);
|
||||
|
||||
case 'u':
|
||||
return static_cast<game_command>
|
||||
(tmp + northeast);
|
||||
(tmp + NORTHEAST);
|
||||
|
||||
case 'b':
|
||||
return static_cast<game_command>
|
||||
(tmp + southwest);
|
||||
(tmp + SOUTHWEST);
|
||||
|
||||
case 'n':
|
||||
return static_cast<game_command>
|
||||
(tmp + southeast);
|
||||
(tmp + SOUTHEAST);
|
||||
|
||||
default:
|
||||
return game_command_panic;
|
||||
return GAME_COMMAND_PANIC;
|
||||
}
|
||||
|
||||
return game_command::game_command_panic;
|
||||
return game_command::GAME_COMMAND_PANIC;
|
||||
}
|
||||
|
Reference in New Issue
Block a user