Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-26 03:39:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr/368' into 420

Browse Source
This commit is contained in:
RogueMaster
2022-10-16 00:36:43 -04:00
parent 16f6c41c87 3a50021348
commit 518bda6b69
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
applications/plugins/flappy_bird/flappy_bird.c
View File

@@ -13,10 +13,10 @@
#define FLAPPY_BIRD_WIDTH 10
#define FLAPPY_PILAR_MAX 6
#define FLAPPY_PILAR_DIST 40
#define FLAPPY_PILAR_DIST 35
#define FLAPPY_GAB_HEIGHT 25
#define FLAPPY_GAB_WIDTH 5
#define FLAPPY_GAB_WIDTH 10
#define FLAPPY_GRAVITY_JUMP -1.1
#define FLAPPY_GRAVITY_TICK 0.15
@@ -101,10 +101,6 @@ static void flappy_game_state_init(GameState* const game_state) {
flappy_game_random_pilar(game_state);
}
// static void flappy_game_reset(GameState* const game_state) {
// FURI_LOG_I(TAG, "Reset Game State\r\n"); // Resetting State
// }
static void flappy_game_tick(GameState* const game_state) {
if(game_state->state == GameStateLife) {
if(!game_state->debug) {
@@ -137,11 +133,12 @@ static void flappy_game_tick(GameState* const game_state) {
}
if(pilar->point.x < -FLAPPY_GAB_WIDTH) pilar->visible = 0;
// Checking out of bounds
if(game_state->bird.point.y < 0 - FLAPPY_BIRD_WIDTH ||
game_state->bird.point.y > FLIPPER_LCD_HEIGHT) {
game_state->state = GameStateGameOver;
break;
if(game_state->bird.point.y <= 0 - FLAPPY_BIRD_WIDTH){
game_state->bird.point.y = 64;
}
if(game_state->bird.point.y > 64 - FLAPPY_BIRD_WIDTH){
game_state->bird.point.y = FLIPPER_LCD_HEIGHT - FLAPPY_BIRD_WIDTH;
}
// Bird inbetween pipes
@@ -305,16 +302,16 @@ int32_t flappy_game_app(void* p) {
if(event.input.type == InputTypePress) {
switch(event.input.key) {
case InputKeyUp:
game_state->bird.point.y--;
if(game_state->state == GameStateLife) {
flappy_game_flap(game_state);
}
break;
case InputKeyDown:
game_state->bird.point.y++;
break;
case InputKeyRight:
game_state->bird.point.x++;
break;
case InputKeyLeft:
game_state->bird.point.x--;
break;
case InputKeyOk:
if(game_state->state == GameStateGameOver) {