mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-11-14 04:37:10 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/zenorogue/hyperrogue

Browse Source
This commit is contained in:
Zeno Rogue
2025-10-10 09:47:43 +02:00
parent 11e74a204b ad5426e007
commit 3e8ad5ddd4
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
celldrawer.cpp
View File

@@ -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 {

11
graph-wall.cpp
View File

@@ -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<cell*, int> fake_minecount;

4
graph.cpp
View File

@@ -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);
@@ -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,