From 89331661652fdf5eef319f6e37be2210f7268cb3 Mon Sep 17 00:00:00 2001 From: Shadow15510 Date: Sat, 5 Jun 2021 21:38:14 +0200 Subject: [PATCH 1/3] Clean the message menu --- Plague.g1a | Bin 69024 -> 68688 bytes src/core.c | 19 +------------------ src/display_engine.c | 10 ---------- src/display_engine.h | 2 -- src/main.c | 6 +++--- 5 files changed, 4 insertions(+), 33 deletions(-) diff --git a/Plague.g1a b/Plague.g1a index 464b4e707100692bf7fa3be4bc1a5ecae7ff0e90..448f4ccf387c3c1f3e77c8cd9753673b5433fa37 100644 GIT binary patch delta 5303 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 LOTUa5p%VRntw}_; delta 5657 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 S2>l}A`~{2j4^hK(e*X^*@W?{| diff --git a/src/core.c b/src/core.c index c70e6bc..603c92f 100644 --- a/src/core.c +++ b/src/core.c @@ -160,23 +160,6 @@ int callback_tick(volatile int *tick) void message(char *msg) { display_message(msg); + getkey(); - int key = 0, frame = 0; - - static volatile int tick = 1; - int t = timer_configure(TIMER_ANY, DNA_ANIMATION_TICK*1000, GINT_CALL(callback_tick, &tick)); - if (t >= 0) timer_start(t); - - while (!key) - { - while(!tick) sleep(); - tick = 0; - - key = rtc_key(); - display_dna_animation(frame); - - frame = (frame + 1) % 16; - } - - if (t >= 0) timer_stop(t); } diff --git a/src/display_engine.c b/src/display_engine.c index c267d96..cc73bb4 100644 --- a/src/display_engine.c +++ b/src/display_engine.c @@ -198,13 +198,3 @@ void display_message(char *msg) } -void display_dna_animation(const int frame) -{ - extern const bopti_image_t img_dna; - - dsubimage(2, 3, &img_dna, 8 * frame, 0, 7, 12, DIMAGE_NONE); - dsubimage(42, 3, &img_dna, 8 * ((frame + 2) % 16), 0, 7, 12, DIMAGE_NONE); - dupdate(); -} - - diff --git a/src/display_engine.h b/src/display_engine.h index 5ac0dee..28960f5 100644 --- a/src/display_engine.h +++ b/src/display_engine.h @@ -21,7 +21,5 @@ void display_mutation_description(const char *name, const char *description, con // output_error : display text and message background void display_message(char *msg); -// display_dna_animation : display the DNA according to the frame number -void display_dna_animation(const int frame); #endif /* _PLAGUE_DISPLAY_ENGINE_H */ \ No newline at end of file diff --git a/src/main.c b/src/main.c index 6fe7651..7f2b26f 100644 --- a/src/main.c +++ b/src/main.c @@ -1,7 +1,7 @@ /* Project name ......: Plague - Version ...........: 1.3.3 - Last modification .: 4 June 2021 + Version ...........: 1.3.4 + Last modification .: 5 June 2021 code and assets provided with licence : GNU General Public Licence v3.0 @@ -20,7 +20,7 @@ #include "mutation_engine.h" #include "save.h" -const char *VERSION = "1.3.3"; +const char *VERSION = "1.3.4"; // title_screen : display the title screen static void title_screen(void); From df4755733a84d05e64163b614d1314fba9d80daf Mon Sep 17 00:00:00 2001 From: Shadow15510 Date: Sun, 6 Jun 2021 09:53:20 +0200 Subject: [PATCH 2/3] minor changes --- src/display_engine.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/display_engine.h b/src/display_engine.h index 28960f5..99bc213 100644 --- a/src/display_engine.h +++ b/src/display_engine.h @@ -21,5 +21,4 @@ void display_mutation_description(const char *name, const char *description, con // output_error : display text and message background void display_message(char *msg); - #endif /* _PLAGUE_DISPLAY_ENGINE_H */ \ No newline at end of file From 6f010578c960777b34da74ebe50fb6ca1030dc41 Mon Sep 17 00:00:00 2001 From: Shadow15510 Date: Sun, 6 Jun 2021 16:19:42 +0200 Subject: [PATCH 3/3] Version 1.3.4 incoming ! --- Plague.g1a | Bin 68688 -> 68688 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Plague.g1a b/Plague.g1a index 448f4ccf387c3c1f3e77c8cd9753673b5433fa37..8c6057ce502af5e9c9e9548a5f46601cb8430434 100644 GIT binary patch delta 22 dcmcaGgXO{umI*FwW_pIEhNg{PTfG?BcmQ1W2EYIS delta 22 dcmcaGgXO{umI*Fwrg}z(#%7IPTfG?BcmQ1G2EPCR