diff --git a/src/brick_game/tetris/tetris.c b/src/brick_game/tetris/tetris.c index ef6f995..54d4c6d 100644 --- a/src/brick_game/tetris/tetris.c +++ b/src/brick_game/tetris/tetris.c @@ -47,14 +47,13 @@ const int (*get_figure_shape(FigureType type, int rotation))[4] { return shapes[type][rotation]; } -void userInput(UserAction_t action, bool hold) { - (void)hold; // Подавляем предупреждение +void user_input(UserAction_t action) { if (!initialized) { memset(&game_state, 0, sizeof(game_state)); initialized = true; } - if (action >= Figure1 && action <= Figure5) { + if (action >= Figure1 && action <= Figure7) { FigureType type = (FigureType)(action - Figure1); game_state.current_figure.type = type; game_state.current_figure.x = FIELD_WIDTH / 2 - 2; diff --git a/src/brick_game/tetris/tetris.h b/src/brick_game/tetris/tetris.h index bf4ccba..362ccde 100644 --- a/src/brick_game/tetris/tetris.h +++ b/src/brick_game/tetris/tetris.h @@ -46,15 +46,17 @@ typedef enum { Up, Down, Action, - Figure1, // 1 - Figure2, // 2 - Figure3, // 3 - Figure4, // 4 - Figure5 // 5 + Figure1, + Figure2, + Figure3, + Figure4, + Figure5, + Figure6, + Figure7 } UserAction_t; // Основные функции библиотеки -void userInput(UserAction_t action, bool hold); +void user_input(UserAction_t action); GameStateData* getGameState(void); const int (*get_figure_shape(FigureType type, int rotation))[4]; diff --git a/src/gui/cli/main.c b/src/gui/cli/main.c index 42a9554..c2a24dc 100644 --- a/src/gui/cli/main.c +++ b/src/gui/cli/main.c @@ -30,6 +30,8 @@ int main() { case '3': action = Figure3; break; case '4': action = Figure4; break; case '5': action = Figure5; break; + case '6': action = Figure6; break; + case '7': action = Figure7; break; case KEY_LEFT: action = Left; break; case KEY_RIGHT: action = Right; break; case KEY_DOWN: action = Down; break; @@ -37,7 +39,7 @@ int main() { } if (action != Undefined) { - userInput(action, hold); + user_input(action); } display_game();