diff --git a/src/console_input.cc b/src/console_input.cc index a284db2..f56ffa5 100644 --- a/src/console_input.cc +++ b/src/console_input.cc @@ -5,17 +5,6 @@ console_input::console_input(std::istream &cin): in{cin} {} -inline game_command get_direction(std::string &str, const char *COMMANDS[], - const int COMMANDS_CNT) { - for (int i = 0; i < COMMANDS_CNT; ++i) - if (str == COMMANDS[i] && - i >= game_command::move_north && - i <= game_command::move_southeast) - return (game_command)i; - - return game_command_panic; -} - game_command console_input::get_command() { const char *COMMANDS[] = { "q", "no", "so", "ea", "we", "ne", "nw", "se", "sw", "u", "a" diff --git a/src/file_input.cc b/src/file_input.cc index 9980646..2fb83d6 100644 --- a/src/file_input.cc +++ b/src/file_input.cc @@ -5,17 +5,6 @@ file_input::file_input(std::ifstream &&ifs): in{std::move(ifs)} {} -inline game_command get_direction(std::string &str, const char *COMMANDS[], - const int COMMANDS_CNT) { - for (int i = 0; i < COMMANDS_CNT; ++i) - if (str == COMMANDS[i] && - i >= game_command::move_north && - i <= game_command::move_southeast) - return (game_command)i; - - return game_command_panic; -} - game_command file_input::get_command() { const char *COMMANDS[] = { "q", "no", "so", "ea", "we", "ne", "nw", "se", "sw", "u", "a" diff --git a/src/input.cc b/src/input.cc new file mode 100644 index 0000000..d5636ee --- /dev/null +++ b/src/input.cc @@ -0,0 +1,12 @@ +#include "input.h" + +game_command get_direction(std::string &str, const char *COMMANDS[], + const int COMMANDS_CNT) { + for (int i = 0; i < COMMANDS_CNT; ++i) + if (str == COMMANDS[i] && + i >= game_command::move_north && + i <= game_command::move_southeast) + return (game_command)i; + + return game_command_panic; +} diff --git a/src/input.h b/src/input.h index 51148a9..c47cc4d 100644 --- a/src/input.h +++ b/src/input.h @@ -1,5 +1,6 @@ #ifndef __INPUT_H__ #define __INPUT_H__ +#include #include "constants.h" class input { @@ -8,4 +9,7 @@ public: virtual game_command get_command() = 0; }; +game_command get_direction(std::string &str, const char *COMMANDS[], + const int COMMANDS_CNT); + #endif