From eeb67620ffc0f0122d7e9eed31d28c08b81106e7 Mon Sep 17 00:00:00 2001 From: "Joseph C. Sible" Date: Sat, 27 Sep 2025 15:13:45 -0400 Subject: [PATCH] Add minetexts up to 14 The truncated heptagonal and truncated triheptagonal tilings both appear in the list of Archimedean tilings, and both contain tetradecagons. It seems that this is the most sides of any polygon in any of the game's non-custom tilings, so it seems like a good choice for how high minetexts should support. --- graph-wall.cpp | 11 +++++++++-- graph.cpp | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/graph-wall.cpp b/graph-wall.cpp index 0ebb723d..b74b6219 100644 --- a/graph-wall.cpp +++ b/graph-wall.cpp @@ -17,7 +17,7 @@ EX colortable distcolors = { 0xA0A000, 0xA000A0, 0x00A0A0, 0xFFD500 }; -EX const char* minetexts[8] = { +EX const char* minetexts[15] = { "No mines next to you.", "A mine is next to you!", "Two mines next to you!", @@ -25,7 +25,14 @@ EX const char* minetexts[8] = { "Four mines next to you!", "Five mines next to you!", "Six mines next to you!", - "Seven mines next to you!" + "Seven mines next to you!", + "Eight mines next to you!", + "Nine mines next to you!", + "Ten mines next to you!", + "Eleven mines next to you!", + "Twelve mines next to you!", + "Thirteen mines next to you!", + "Fourteen mines next to you!" }; EX map fake_minecount; diff --git a/graph.cpp b/graph.cpp index 0598ca01..d84094fd 100644 --- a/graph.cpp +++ b/graph.cpp @@ -1987,7 +1987,7 @@ EX void drawscreen() { its(hive::bugcount[k]), minf[moBug0+k].color, 8); bool minefieldNearby = false; - int mines[MAXPLAYER], tmines=0; + unsigned mines[MAXPLAYER], tmines=0; for(int p=0; pycenter - current_display->radius * 3/4, 2, vid.fsize, - mines[p] > 7 ? its(mines[p]) : XLAT(minetexts[mines[p]]), minecolors[mines[p]], 8); + mines[p] > sizeof(minetexts) / sizeof(minetexts[0]) ? its(mines[p]) : XLAT(minetexts[mines[p]]), minecolors[mines[p]], 8); if(minefieldNearby && !shmup::on && cwt.at->land != laMinefield && cwt.peek()->land != laMinefield && !dont_display_minecount) { displayfr(vid.xres/2, current_display->ycenter - current_display->radius * 3/4 - vid.fsize*3/2, 2,