From e816e43dd7b5e286f1832578b6883ac982d7d787 Mon Sep 17 00:00:00 2001 From: Tituya Date: Sun, 4 Jul 2021 23:29:42 +0200 Subject: [PATCH] selected mutation menu --- CMakeLists.txt | 1 + assets-cg/selectedmenu.png | Bin 0 -> 9041 bytes src/display_engine.c | 33 ++++++++++++--------------------- 3 files changed, 13 insertions(+), 21 deletions(-) create mode 100644 assets-cg/selectedmenu.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e10f4c..dbad882 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,7 @@ set(ASSETS_cg assets-cg/message.png assets-cg/grid.png assets-cg/infos.png + assets-cg/selectedmenu.png assets-cg/mutations.png assets-cg/cursor.png assets-cg/title.png diff --git a/assets-cg/selectedmenu.png b/assets-cg/selectedmenu.png new file mode 100644 index 0000000000000000000000000000000000000000..9327b5a770432d75cca5fdcc3818df1c344a49e0 GIT binary patch literal 9041 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%0Dsl2(Xb1+t`Va?hX-q-?=Ee`wTN+51?bDt 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 JTG{f${{S?vSTXdna); + dprint(155, 123, C_BLACK, "ADN : %d", current_game->dna); length = 67 * current_game->contagion / 100; - dline(57, 48, 57 + length, 48, C_BLACK); - dline(57, 49, 57 + length, 49, C_BLACK); + drect(122, 160, 122+length, 165, C_RGB(255, 0, 255)); length = 67 * current_game->severity / 100; - dline(57, 54, 57 + length, 54, C_BLACK); - dline(57, 55, 57 + length, 55, C_BLACK); + drect(122, 180, 122+length, 185, C_RGB(255, 255, 0)); length = 67 * current_game->lethality / 100; - dline(57, 60, 57 + length, 60, C_BLACK); - dline(57, 61, 57 + length, 61, C_BLACK); + drect(122, 200, 122+length, 205, C_RGB(114, 0, 136)); - if (current_game->mutations_selected[0]) dsubimage(7, 15, &img_mutations, 0, 44 * (current_game->mutations_selected[0] - 1), 44, 44, 0); - if (current_game->mutations_selected[1]) dsubimage(37, 15, &img_mutations, 44, 44 * (current_game->mutations_selected[1] - 1), 44, 44, 0); - if (current_game->mutations_selected[2]) dsubimage(67, 15, &img_mutations, 88, 44 * (current_game->mutations_selected[2] - 1), 44, 44, 0); + if (current_game->mutations_selected[0]) dsubimage(78, 67, &img_mutations, 0, 44 * (current_game->mutations_selected[0] - 1), 44, 44, 0); + if (current_game->mutations_selected[1]) dsubimage(176, 67, &img_mutations, 44, 44 * (current_game->mutations_selected[1] - 1), 44, 44, 0); + if (current_game->mutations_selected[2]) dsubimage(273, 67, &img_mutations, 88, 44 * (current_game->mutations_selected[2] - 1), 44, 44, 0); break; } } @@ -127,7 +118,7 @@ void display_mutation(const int table[4][8], const struct cursor c, const int mu dprint(138,14,C_WHITE, "CAPACITES"); break; case 3: - dprint(117,14,C_WHITE, "TRANSMISSION"); + dprint(130,14,C_WHITE, "DIFFUSIONS"); break; }