From 1f6f919b932cbc84aae63c5e8f43e44431ba8afd Mon Sep 17 00:00:00 2001 From: KikooDX Date: Wed, 25 Mar 2020 13:48:11 +0100 Subject: [PATCH] =?UTF-8?q?(menu)=20Display=20time=20that=20was=20at=20the?= =?UTF-8?q?=20end=20of=20the=20last=20screen=20(Leph=C3=A9nixnoir=20sugges?= =?UTF-8?q?tion)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JTMM.g3a | Bin 71968 -> 72032 bytes include/menu.h | 3 ++- src/main.c | 4 +++- src/menu.c | 4 +++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/JTMM.g3a b/JTMM.g3a index e21de921543d2fc734e212338b3ec357fdb79733..10720aec0d60fca6b90fc0cd4d94b451bea0eff1 100644 GIT binary patch delta 3676 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 blue, 1 -> red char enable_up_key = 0; @@ -214,6 +215,7 @@ int main(void) if (collide(player_x, player_y, level, 'E')) { level_id++; + rem_step = step; if (level_id == 5060) { just_breathe(step); @@ -234,7 +236,7 @@ int main(void) { if (!exit_buffer) { - char reload = menu(&level_id, &enable_up_key, &game_loop); + char reload = menu(&level_id, &enable_up_key, &game_loop, rem_step); if (reload) { if (level_id == 5050) diff --git a/src/menu.c b/src/menu.c index df8d0fb..b21e7f9 100644 --- a/src/menu.c +++ b/src/menu.c @@ -6,7 +6,8 @@ #define Y_POS 88 -char menu(int *level_id, char *enable_up_key, char *game_loop) +char menu(int *level_id, char *enable_up_key, char *game_loop, + unsigned int rem_step) { char reload = 0; char selected = 0; @@ -22,6 +23,7 @@ char menu(int *level_id, char *enable_up_key, char *game_loop) if (selected == 4) selected = 0; else if (selected == -1) selected = 3; dclear(0); + dprint(0, 0, C_WHITE, C_BLACK, "%u.%02u", rem_step/60, rem_step%60); dtext(32, Y_POS, "CONTINUE", C_WHITE, C_BLACK); dtext(32, Y_POS + 12, "SELECT LEVEL", C_WHITE, C_BLACK); dtext(32, Y_POS + 24, "UP KEY TO JUMP:", C_WHITE, C_BLACK);