Skip to content

Feature: game_2048 hold center to restart #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RogueMaster merged 3 commits into from
Jul 30, 2022
Merged

Feature: game_2048 hold center to restart #133

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54e6559
Feature: game_2048 press center to restart
DevMilanIan Jul 30, 2022
dca2363
Fix UNUSED
DevMilanIan Jul 30, 2022
b110f4e
Fix: require long press to restart
DevMilanIan Jul 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions applications/game2048/game_2048.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,21 @@ static void game_2048_process_move(GameState* const game_state) {
// </debug>
}

static void game_2048_restart(GameState* const game_state) {
// clear all cells
for(uint8_t y = 0; y < 4; y++) {
for(uint8_t x = 0; x < 4; x++) {
game_state->field[y][x] = 0;
}
}

// start next game
game_2048_set_new_number(game_state);
game_2048_set_new_number(game_state);
}

int32_t game_2048_app(void* p) {
UNUSED(p);
int32_t return_code = 0;

FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(InputEvent));
Expand Down Expand Up @@ -377,7 +391,7 @@ int32_t game_2048_app(void* p) {
GameState* game_state = (GameState*)acquire_mutex_block(&state_mutex);

if(event_status == FuriStatusOk) {
if(event.type == InputTypePress) {
if(event.type == InputTypeShort) {
switch(event.key) {
case InputKeyUp:
game_state->direction = DirectionUp;
Expand All @@ -399,12 +413,18 @@ int32_t game_2048_app(void* p) {
game_2048_process_move(game_state);
game_2048_set_new_number(game_state);
break;
case InputKeyOk:; // TODO: reinit in game ower state
case InputKeyOk:
game_state->direction = DirectionIdle;
break;
case InputKeyBack:
loop = false;
break;
}
} else if(event.type == InputTypeLong) {
if(event.key == InputKeyOk) {
game_state->direction = DirectionIdle;
game_2048_restart(game_state);
}
}
}

Expand All @@ -423,4 +443,4 @@ int32_t game_2048_app(void* p) {
furi_message_queue_free(event_queue);

return return_code;
}
}