capitalized all enums
This commit is contained in:
@ -12,53 +12,53 @@ game_command console_input::get_command() {
|
||||
in >> cmd;
|
||||
|
||||
if (in.eof())
|
||||
return game_command_terminate;
|
||||
return GAME_COMMAND_TERMINATE;
|
||||
|
||||
if (cmd == "q")
|
||||
return game_command_terminate;
|
||||
return GAME_COMMAND_TERMINATE;
|
||||
else if (cmd == "f")
|
||||
return the_world;
|
||||
return THE_WORLD;
|
||||
else if (cmd == "r")
|
||||
return game_restart;
|
||||
return GAME_RESTART;
|
||||
else if (cmd == "u" || cmd == "a" || cmd == "T") {
|
||||
auto cmdtmp = cmd;
|
||||
in >> cmd;
|
||||
|
||||
if (in.eof())
|
||||
return game_command_panic;
|
||||
return GAME_COMMAND_PANIC;
|
||||
|
||||
auto tmp = get_direction(cmd);
|
||||
|
||||
if (cmdtmp == "u")
|
||||
return static_cast<game_command>
|
||||
(tmp + apply_north);
|
||||
(tmp + APPLY_NORTH);
|
||||
else if (cmdtmp == "a")
|
||||
return static_cast<game_command>
|
||||
(tmp + attack_north);
|
||||
(tmp + ATTACK_NORTH);
|
||||
else
|
||||
return static_cast<game_command>
|
||||
(tmp + throw_north);
|
||||
(tmp + THROW_NORTH);
|
||||
} else if (cmd == "yes") {
|
||||
return game_command::enter;
|
||||
return game_command::ENTER;
|
||||
} else if (cmd == "i") {
|
||||
return toggle_inventory;
|
||||
return TOGGLE_INVENTORY;
|
||||
} else if (cmd == "s") {
|
||||
return select_shade;
|
||||
return SELECT_SHADE;
|
||||
} else if (cmd == "d") {
|
||||
return select_drow;
|
||||
return SELECT_DROW;
|
||||
} else if (cmd == "v") {
|
||||
return select_vampire;
|
||||
return SELECT_VAMPIRE;
|
||||
} else if (cmd == "g") {
|
||||
return select_goblin;
|
||||
return SELECT_GOBLIN;
|
||||
} else if (cmd == "t") {
|
||||
return select_troll;
|
||||
return SELECT_TROLL;
|
||||
} else {
|
||||
auto tmp = get_direction(cmd);
|
||||
|
||||
if (tmp != game_command_panic)
|
||||
if (tmp != GAME_COMMAND_PANIC)
|
||||
return static_cast<game_command>
|
||||
(tmp + move_north);
|
||||
(tmp + MOVE_NORTH);
|
||||
}
|
||||
|
||||
return game_command_pass;
|
||||
return GAME_COMMAND_PASS;
|
||||
}
|
||||
|
Reference in New Issue
Block a user