From 53f62057667f36246175cfe2af6db8d6492b53e5 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Fri, 9 Jun 2023 14:14:05 +0300 Subject: [PATCH] dolphin did --- applications/external/arkanoid/arkanoid_game.c | 2 +- applications/external/blackjack/blackjack.c | 4 ++-- applications/external/bomberduck/bomberduck.c | 4 ++-- applications/external/doom/doom.c | 2 +- applications/external/flappy_bird/flappy_bird.c | 2 +- applications/external/game15/game15.c | 2 +- applications/external/game_2048/game_2048.c | 2 +- applications/external/heap_defence_game/heap_defence.c | 2 +- applications/external/minesweeper/minesweeper.c | 4 ++-- applications/external/solitaire/solitaire.c | 4 ++-- applications/external/swd_probe/swd_probe_app.c | 2 +- applications/external/tetris_game/tetris_game.c | 2 +- applications/external/tictactoe_game/tictactoe_game.c | 2 +- applications/external/totp/totp_app.c | 2 +- applications/external/zombiez/zombiez.c | 4 ++-- applications/main/lfrfid/lfrfid.c | 2 +- applications/main/nfc/nfc.c | 2 +- applications/main/nfc/scenes/nfc_scene_read.c | 2 +- applications/main/subghz/scenes/subghz_scene_start.c | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/applications/external/arkanoid/arkanoid_game.c b/applications/external/arkanoid/arkanoid_game.c index a8b846579..2adf2e30b 100644 --- a/applications/external/arkanoid/arkanoid_game.c +++ b/applications/external/arkanoid/arkanoid_game.c @@ -399,7 +399,7 @@ int32_t arkanoid_game_app(void* p) { gui_add_view_port(gui, view_port, GuiLayerFullscreen); // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); + dolphin_deed(DolphinDeedPluginGameStart); GameEvent event; for(bool processing = true; processing;) { diff --git a/applications/external/blackjack/blackjack.c b/applications/external/blackjack/blackjack.c index 44db29087..c4ef8d3a7 100644 --- a/applications/external/blackjack/blackjack.c +++ b/applications/external/blackjack/blackjack.c @@ -276,7 +276,7 @@ void dealer_tick(GameState* game_state) { if(dealer_score >= DEALER_MAX) { if(dealer_score > 21 || dealer_score < player_score) { - DOLPHIN_DEED(DolphinDeedPluginGameWin); + dolphin_deed(DolphinDeedPluginGameWin); enqueue( &(game_state->queue_state), game_state, @@ -571,7 +571,7 @@ int32_t blackjack_app(void* p) { AppEvent event; // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); + dolphin_deed(DolphinDeedPluginGameStart); for(bool processing = true; processing;) { FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100); diff --git a/applications/external/bomberduck/bomberduck.c b/applications/external/bomberduck/bomberduck.c index 2c1c2940a..79471c99e 100644 --- a/applications/external/bomberduck/bomberduck.c +++ b/applications/external/bomberduck/bomberduck.c @@ -383,7 +383,7 @@ int32_t bomberduck_app(void* p) { return 255; } - DOLPHIN_DEED(DolphinDeedPluginGameStart); + dolphin_deed(DolphinDeedPluginGameStart); // Создаем новый view port ViewPort* view_port = view_port_alloc(); // Создаем callback отрисовки, без контекста @@ -458,7 +458,7 @@ int32_t bomberduck_app(void* p) { world.running = 0; world.level += 1; if(world.level % 5 == 0) { - DOLPHIN_DEED(DolphinDeedPluginGameWin); + dolphin_deed(DolphinDeedPluginGameWin); } } for(int i = 0; i < world.bombs_count; i++) { diff --git a/applications/external/doom/doom.c b/applications/external/doom/doom.c index 2fb99a635..b9cea97a0 100644 --- a/applications/external/doom/doom.c +++ b/applications/external/doom/doom.c @@ -991,7 +991,7 @@ int32_t doom_app() { music_player_worker_start(plugin_state->music_instance->worker); #endif // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); + dolphin_deed(DolphinDeedPluginGameStart); for(bool processing = true; processing;) { FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100); diff --git a/applications/external/flappy_bird/flappy_bird.c b/applications/external/flappy_bird/flappy_bird.c index 709219bb5..2a50868f2 100644 --- a/applications/external/flappy_bird/flappy_bird.c +++ b/applications/external/flappy_bird/flappy_bird.c @@ -309,7 +309,7 @@ int32_t flappy_game_app(void* p) { gui_add_view_port(gui, view_port, GuiLayerFullscreen); // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); + dolphin_deed(DolphinDeedPluginGameStart); GameEvent event; for(bool processing = true; processing;) { diff --git a/applications/external/game15/game15.c b/applications/external/game15/game15.c index 43d2e12f4..d81cea9be 100644 --- a/applications/external/game15/game15.c +++ b/applications/external/game15/game15.c @@ -464,7 +464,7 @@ int32_t game15_app() { FPS, (SandboxRenderCallback)render_callback, (SandboxEventHandler)game_event_handler); // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); + dolphin_deed(DolphinDeedPluginGameStart); sandbox_loop(); sandbox_free(); diff --git a/applications/external/game_2048/game_2048.c b/applications/external/game_2048/game_2048.c index a1e6361b6..a7f84a411 100644 --- a/applications/external/game_2048/game_2048.c +++ b/applications/external/game_2048/game_2048.c @@ -401,7 +401,7 @@ int32_t game_2048_app() { gui_add_view_port(gui, view_port, GuiLayerFullscreen); // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); + dolphin_deed(DolphinDeedPluginGameStart); bool is_finished = false; while(!is_finished) { diff --git a/applications/external/heap_defence_game/heap_defence.c b/applications/external/heap_defence_game/heap_defence.c index 0958d4363..3c8483c75 100644 --- a/applications/external/heap_defence_game/heap_defence.c +++ b/applications/external/heap_defence_game/heap_defence.c @@ -535,7 +535,7 @@ int32_t heap_defence_app(void* p) { game->animation = AnimationPause; // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); + dolphin_deed(DolphinDeedPluginGameStart); GameEvent event = {0}; while(event.input.key != InputKeyBack) { diff --git a/applications/external/minesweeper/minesweeper.c b/applications/external/minesweeper/minesweeper.c index 37332b51d..c169b075e 100644 --- a/applications/external/minesweeper/minesweeper.c +++ b/applications/external/minesweeper/minesweeper.c @@ -240,7 +240,7 @@ static bool game_won(Minesweeper* minesweeper_state) { dialog_message_set_buttons(message, NULL, "Play again", NULL); // Call dolphin deed when we win the game - DOLPHIN_DEED(DolphinDeedPluginGameWin); + dolphin_deed(DolphinDeedPluginGameWin); DialogMessageButton choice = dialog_message_show(minesweeper_state->dialogs, message); dialog_message_free(message); @@ -397,7 +397,7 @@ int32_t minesweeper_app(void* p) { gui_add_view_port(gui, view_port, GuiLayerFullscreen); // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); + dolphin_deed(DolphinDeedPluginGameStart); PluginEvent event; for(bool processing = true; processing;) { diff --git a/applications/external/solitaire/solitaire.c b/applications/external/solitaire/solitaire.c index 7d39ae636..4970fd8d9 100644 --- a/applications/external/solitaire/solitaire.c +++ b/applications/external/solitaire/solitaire.c @@ -276,7 +276,7 @@ void tick(GameState* game_state, NotificationApp* notification) { if(game_state->state == GameStatePlay) { if(game_state->top_cards[0].character == 11 && game_state->top_cards[1].character == 11 && game_state->top_cards[2].character == 11 && game_state->top_cards[3].character == 11) { - DOLPHIN_DEED(DolphinDeedPluginGameWin); + dolphin_deed(DolphinDeedPluginGameWin); game_state->state = GameStateAnimate; return; } @@ -492,7 +492,7 @@ int32_t solitaire_app(void* p) { AppEvent event; // Call Dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); + dolphin_deed(DolphinDeedPluginGameStart); for(bool processing = true; processing;) { FuriStatus event_status = furi_message_queue_get(event_queue, &event, 150); diff --git a/applications/external/swd_probe/swd_probe_app.c b/applications/external/swd_probe/swd_probe_app.c index e8846b9e2..27ef03f5d 100644 --- a/applications/external/swd_probe/swd_probe_app.c +++ b/applications/external/swd_probe/swd_probe_app.c @@ -3130,7 +3130,7 @@ int32_t swd_probe_app_main(void* p) { DBGS("swd_execute_script"); swd_execute_script(app, ANY_PATH("swd_scripts/startup.swd")); - DOLPHIN_DEED(DolphinDeedPluginGameStart); + dolphin_deed(DolphinDeedPluginGameStart); DBGS("processing"); for(bool processing = true; processing;) { diff --git a/applications/external/tetris_game/tetris_game.c b/applications/external/tetris_game/tetris_game.c index 5752e1fc3..07534d725 100644 --- a/applications/external/tetris_game/tetris_game.c +++ b/applications/external/tetris_game/tetris_game.c @@ -389,7 +389,7 @@ int32_t tetris_game_app() { uint8_t downRepeatCounter = 0; // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); + dolphin_deed(DolphinDeedPluginGameStart); for(bool processing = true; processing;) { // This 10U implicitly sets the game loop speed. downRepeatCounter relies on this value diff --git a/applications/external/tictactoe_game/tictactoe_game.c b/applications/external/tictactoe_game/tictactoe_game.c index e617e7c18..6ad076a4a 100644 --- a/applications/external/tictactoe_game/tictactoe_game.c +++ b/applications/external/tictactoe_game/tictactoe_game.c @@ -333,7 +333,7 @@ int32_t tictactoe_game_app(void* p) { gui_add_view_port(gui, view_port, GuiLayerFullscreen); // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); + dolphin_deed(DolphinDeedPluginGameStart); GameEvent event; for(bool processing = true; processing;) { diff --git a/applications/external/totp/totp_app.c b/applications/external/totp/totp_app.c index 8b0a8c1fa..57e5ff04f 100644 --- a/applications/external/totp/totp_app.c +++ b/applications/external/totp/totp_app.c @@ -173,7 +173,7 @@ int32_t totp_app() { } // Affecting dolphin level - DOLPHIN_DEED(DolphinDeedPluginStart); + dolphin_deed(DolphinDeedPluginStart); // Set system callbacks ViewPort* view_port = view_port_alloc(); diff --git a/applications/external/zombiez/zombiez.c b/applications/external/zombiez/zombiez.c index 602eea723..a9bf74f7a 100644 --- a/applications/external/zombiez/zombiez.c +++ b/applications/external/zombiez/zombiez.c @@ -232,7 +232,7 @@ static void tick(PluginState* const plugin_state) { free(z); plugin_state->zombies[i] = NULL; plugin_state->score++; - //if(plugin_state->score % 15 == 0) DOLPHIN_DEED(getRandomDeed()); + //if(plugin_state->score % 15 == 0) dolphin_deed(getRandomDeed()); //} } else if(z->position.x <= WALL_X && z->position.x > 0) { // zombie got to the wall plugin_state->zombies_count -= 1; @@ -315,7 +315,7 @@ int32_t zombiez_game_app(void* p) { gui_add_view_port(gui, view_port, GuiLayerFullscreen); // Call dolphin deed on game start - DOLPHIN_DEED(DolphinDeedPluginGameStart); + dolphin_deed(DolphinDeedPluginGameStart); PluginEvent event; bool isRunning = true; diff --git a/applications/main/lfrfid/lfrfid.c b/applications/main/lfrfid/lfrfid.c index 576779cd1..6f7dd7432 100644 --- a/applications/main/lfrfid/lfrfid.c +++ b/applications/main/lfrfid/lfrfid.c @@ -190,7 +190,7 @@ int32_t lfrfid_app(void* p) { view_dispatcher_attach_to_gui( app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen); scene_manager_next_scene(app->scene_manager, LfRfidSceneEmulate); - DOLPHIN_DEED(DolphinDeedRfidEmulate); + dolphin_deed(DolphinDeedRfidEmulate); } else { // TODO: exit properly lfrfid_free(app); diff --git a/applications/main/nfc/nfc.c b/applications/main/nfc/nfc.c index e1f416eee..110907832 100644 --- a/applications/main/nfc/nfc.c +++ b/applications/main/nfc/nfc.c @@ -292,7 +292,7 @@ int32_t nfc_app(void* p) { dolphin_deed(DolphinDeedNfcEmulate); } else if(nfc->dev->format == NfcDeviceSaveFormatNfcV) { scene_manager_next_scene(nfc->scene_manager, NfcSceneNfcVEmulate); - DOLPHIN_DEED(DolphinDeedNfcEmulate); + dolphin_deed(DolphinDeedNfcEmulate); } else { scene_manager_next_scene(nfc->scene_manager, NfcSceneEmulateUid); dolphin_deed(DolphinDeedNfcEmulate); diff --git a/applications/main/nfc/scenes/nfc_scene_read.c b/applications/main/nfc/scenes/nfc_scene_read.c index 1e8976617..f254e08f8 100644 --- a/applications/main/nfc/scenes/nfc_scene_read.c +++ b/applications/main/nfc/scenes/nfc_scene_read.c @@ -93,7 +93,7 @@ bool nfc_scene_read_on_event(void* context, SceneManagerEvent event) { } else if(event.event == NfcWorkerEventReadBankCard) { notification_message(nfc->notifications, &sequence_success); scene_manager_next_scene(nfc->scene_manager, NfcSceneEmvReadSuccess); - DOLPHIN_DEED(DolphinDeedNfcReadSuccess); + dolphin_deed(DolphinDeedNfcReadSuccess); consumed = true; } else if(event.event == NfcWorkerEventReadMfClassicDictAttackRequired) { if(mf_classic_dict_check_presence(MfClassicDictTypeSystem)) { diff --git a/applications/main/subghz/scenes/subghz_scene_start.c b/applications/main/subghz/scenes/subghz_scene_start.c index ba405c737..eceedda5e 100644 --- a/applications/main/subghz/scenes/subghz_scene_start.c +++ b/applications/main/subghz/scenes/subghz_scene_start.c @@ -110,7 +110,7 @@ bool subghz_scene_start_on_event(void* context, SceneManagerEvent event) { scene_manager_set_scene_state( subghz->scene_manager, SubGhzSceneStart, SubmenuIndexFrequencyAnalyzer); scene_manager_next_scene(subghz->scene_manager, SubGhzSceneFrequencyAnalyzer); - DOLPHIN_DEED(DolphinDeedSubGhzFrequencyAnalyzer); + dolphin_deed(DolphinDeedSubGhzFrequencyAnalyzer); return true; } else if(event.event == SubmenuIndexTest) { scene_manager_set_scene_state(