Skip to content

Improve Minefield display when there are more than seven mines #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zenorogue merged 2 commits into from
Oct 10, 2025
Merged

Improve Minefield display when there are more than seven mines #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeb6762
Add minetexts up to 14
josephcsible Sep 27, 2025
2d3572e
Make 10+ mines in numeric mode have the multicolored outline too
josephcsible Sep 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions celldrawer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1433,6 +1433,8 @@ EX void draw_mine_numbers(int mines, const shiftmatrix& V, int ct6) {
if(mines == 0 && mine_zero_display < (WDIM == 3 ? 1 : 2)) return;
if(numerical_minefield) {
string label = its(mines);
dynamicval<color_t> dc(poly_outline);
if(mines >= isize(minecolors)) poly_outline = darkena(minecolors[mines/isize(minecolors)], 0, 0xFF);
queuestr(V, (mines >= 10 ? .5 : 1) * mapfontscale / 100, label, darkened(minecolors[mines]), 8);
}
else {
Expand Down
11 changes: 9 additions & 2 deletions graph-wall.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,22 @@ 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!",
"Three mines next to you!",
"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<cell*, int> fake_minecount;
Expand Down
4 changes: 2 additions & 2 deletions graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; p<numplayers(); p++) {
mines[p] = 0;
cell *c = playerpos(p);
Expand All @@ -2013,7 +2013,7 @@ EX void drawscreen() {
displayfr(vid.xres * (p+.5) / numplayers(),
current_display->ycenter - 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,
Expand Down