mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 06:27:17 +00:00
Code Issues Releases Wiki Activity

do not crash inventory into radar

Browse Source
This commit is contained in:
Zeno Rogue 2024-06-21 17:15:42 +02:00
parent ec1740f6e5
commit 2488cfd914
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hud.cpp
View File

@ -475,7 +475,9 @@ EX string mode_description1() {
if(md == "") return "standard"; if(md == "") return "standard";
return md.substr(1); return md.substr(1);
} }
EX bool radar_drawn;
EX void drawStats() { EX void drawStats() {
if(vid.stereo_mode == sLR) return; if(vid.stereo_mode == sLR) return;
draw_crosshair(); draw_crosshair();
@ -491,19 +493,25 @@ EX void drawStats() {
bool cornermode = (vid.xres > vid.yres * 85/100 && vid.yres > vid.xres * 85/100); bool cornermode = (vid.xres > vid.yres * 85/100 && vid.yres > vid.xres * 85/100);
bool hyb = mhybrid;
#if MAXMDIM >= 4 #if MAXMDIM >= 4
if(mhybrid) hybrid::draw_underlying(!cornermode); if(mhybrid) hybrid::draw_underlying(!cornermode);
#endif #endif
{ {
radar_drawn = false;
if(vid.radarsize > 0 && h) if(vid.radarsize > 0 && h)
#if CAP_RACING #if CAP_RACING
if(!racing::on) if(!racing::on)
#endif #endif
if(!peace::on) if(!peace::on)
if(!(cmode & sm::MISSION)) if(!(cmode & sm::MISSION))
draw_radar(cornermode); radar_drawn = true;
if(radar_drawn)
draw_radar(cornermode);
flat_model_enabler fme; flat_model_enabler fme;
@ -574,10 +582,15 @@ EX void drawStats() {
} }
else { else {
auto& cd = current_display;
bool portrait = vid.xres < vid.yres; bool portrait = vid.xres < vid.yres;
int colspace = portrait ? (current_display->ycenter - current_display->scrsize - 3 * vid.fsize) : (vid.xres - vid.yres - 16) / 2; int colspace = portrait ? (cd->ycenter - cd->scrsize - 3 * vid.fsize) : (vid.xres - vid.yres - 16) / 2;
int rowspace = portrait ? vid.xres - 16 : vid.yres - vid.fsize * (vid.msgleft ? 9 : 4); int radar_size = 0;
if(radar_drawn) radar_size = 2 * vid.radarsize + 10 + 3.5 * vid.fsize;
if(hyb && hybrid::underlying_scale) radar_size = max<int>(radar_size, min(cd->xsize, cd->ysize) * hybrid::underlying_scale + 10 + 3.5 * vid.fsize);
int rowspace = portrait ? vid.xres - 16 : vid.yres - max(radar_size, vid.fsize * (vid.msgleft ? 9 : 4));
int colid[4], rowid[4]; int colid[4], rowid[4];
int maxbyclass[4]; int maxbyclass[4];
for(int z=0; z<4; z++) maxbyclass[z] = 0; for(int z=0; z<4; z++) maxbyclass[z] = 0;