From 7cd542d76b618cced846a3c69d8be785b21a69ca Mon Sep 17 00:00:00 2001 From: "Joseph C. Sible" Date: Fri, 10 Oct 2025 20:35:24 -0400 Subject: [PATCH] Get rid of "no item" for Cellular Automaton in the world overview --- menus.cpp | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/menus.cpp b/menus.cpp index 0f93d480..8132507d 100644 --- a/menus.cpp +++ b/menus.cpp @@ -103,24 +103,26 @@ EX void showOverview() { displayfrZ(1, i0, 1, vf-4, "*", forecolor, 0); if(displayfrZH(xr*1, i0, 1, vf-4, XLAT1(linf[l].name), col, 0)) getcstat = 1000 + l; + int c8 = (vf+2)/3; eItem it = treasureType(l); int lv = items[it] * landMultiplier(l); - if(lv >= 25) col = 0xFFD500; - else if(lv && it == itSavedPrincess) col = 0xFFD500; - else if(lv >= 10) col = 0x00D500; - else if(items[it]) col = 0xC0C0C0; - else col = BLACKISH; - int c8 = (vf+2)/3; - if(displayfrZH(xr*24-c8*6, i0, 1, vf-4, (required_for_hyperstones(it) ? "" : "*") + its(items[it]), col, 16)) - getcstat = 2000+it; - if(!cheater) - if(displayfrZH(xr*24, i0, 1, vf-4, its(hiitems[modecode()][it]), col, 16)) - getcstat = 2000+it; - if(items[it]) col = iinf[it].color; else col = BLACKISH; - if(displayfrZH(xr*24+c8*4, i0, 1, vf-4, s0 + iinf[it].glyph, col, 16)) - getcstat = 2000+it; - if(displayfrZH(xr*24+c8*5, i0, 1, vf-4, XLAT1(iinf[it].name), col, 0)) - getcstat = 2000+it; + if(it) { + if(lv >= 25) col = 0xFFD500; + else if(lv && it == itSavedPrincess) col = 0xFFD500; + else if(lv >= 10) col = 0x00D500; + else if(items[it]) col = 0xC0C0C0; + else col = BLACKISH; + if(displayfrZH(xr*24-c8*6, i0, 1, vf-4, (required_for_hyperstones(it) ? "" : "*") + its(items[it]), col, 16)) + getcstat = 2000+it; + if(!cheater) + if(displayfrZH(xr*24, i0, 1, vf-4, its(hiitems[modecode()][it]), col, 16)) + getcstat = 2000+it; + if(items[it]) col = iinf[it].color; else col = BLACKISH; + if(displayfrZH(xr*24+c8*4, i0, 1, vf-4, s0 + iinf[it].glyph, col, 16)) + getcstat = 2000+it; + if(displayfrZH(xr*24+c8*5, i0, 1, vf-4, XLAT1(iinf[it].name), col, 0)) + getcstat = 2000+it; + } eItem io = nativeOrbType(l); if(io == itShard) { if(items[it] >= 10) col = winf[waMirror].color; else col = BLACKISH;