diff --git a/Plague.g1a b/Plague.g1a index 464b4e7..8c6057c 100644 Binary files a/Plague.g1a and b/Plague.g1a differ diff --git a/src/core.c b/src/core.c index 7af746b..0b4573e 100644 --- a/src/core.c +++ b/src/core.c @@ -161,23 +161,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..99bc213 100644 --- a/src/display_engine.h +++ b/src/display_engine.h @@ -21,7 +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); -// 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 437c85c..4ca8bd5 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,10 @@ /* Project name ......: Plague +<<<<<<< HEAD Version ...........: 1.3.3 +======= + Version ...........: 1.3.4 +>>>>>>> dev Last modification .: 5 June 2021 code and assets provided with licence : @@ -20,7 +24,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);