Przeglądaj źródła

Merge jetpack_joyride from https://github.com/timstrasser/flipper-jetpack-game

# Conflicts:
#	jetpack_joyride/application.fam
#	jetpack_joyride/jetpack.c
Willy-JL 1 rok temu
rodzic
commit
0f51370211
2 zmienionych plików z 7 dodań i 6 usunięć
  1. 1 0
      jetpack_joyride/application.fam
  2. 6 6
      jetpack_joyride/jetpack.c

+ 1 - 0
jetpack_joyride/application.fam

@@ -13,4 +13,5 @@ App(
     fap_category="Games",
     fap_icon_assets="assets",
     fap_icon_assets_symbol="jetpack_game",
+    fap_version="1.1",
 )

+ 6 - 6
jetpack_joyride/jetpack.c

@@ -251,18 +251,18 @@ static void jetpack_game_render_callback(Canvas* const canvas, void* ctx) {
     furi_mutex_release(game_state->mutex);
 }
 
-static void jetpack_game_input_callback(InputEvent* input_event, void* ctx) {
-    furi_assert(ctx);
-    FuriMessageQueue* event_queue = ctx;
+static void jetpack_game_input_callback(InputEvent* input_event, void* context) {
+    furi_assert(context);
 
+    FuriMessageQueue* event_queue = context;
     GameEvent event = {.type = EventTypeKey, .input = *input_event};
     furi_message_queue_put(event_queue, &event, FuriWaitForever);
 }
 
-static void jetpack_game_update_timer_callback(void* ctx) {
-    furi_assert(ctx);
-    FuriMessageQueue* event_queue = ctx;
+static void jetpack_game_update_timer_callback(void* context) {
+    furi_assert(context);
 
+    FuriMessageQueue* event_queue = context;
     GameEvent event = {.type = EventTypeTick};
     furi_message_queue_put(event_queue, &event, 0);
 }