From f67452eccb23dedea0869ecc78d127e9e643faea Mon Sep 17 00:00:00 2001 From: Jesse Ruderman Date: Sat, 3 Jul 2021 16:12:39 -0700 Subject: [PATCH] Fix HUD kill list in 'items only' mode --- hud.cpp | 9 +++++---- inventory.cpp | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hud.cpp b/hud.cpp index 84000b1c..919a547c 100644 --- a/hud.cpp +++ b/hud.cpp @@ -173,10 +173,10 @@ int glyphflags(int gid) { return f; } -EX bool graphglyph() { +EX bool graphglyph(bool isMonster) { // if(GDIM == 3) return false; if(vrhr::active()) return false; - return vid.graphglyph == 2 || (vid.graphglyph == 1 && vid.monmode); + return vid.graphglyph == 2 || (vid.graphglyph == 1 && (isMonster ? mmmon : mmitem)); } bool displayglyph(int cx, int cy, int buttonsize, char glyph, color_t color, int qty, int flags, int id) { @@ -190,10 +190,11 @@ bool displayglyph(int cx, int cy, int buttonsize, char glyph, color_t color, int int d = ticks - glasttime[id]; double zoom = (d <= 250 && d >= 0) ? 1.25 - .001 * d : 1; glsize = int(glsize * zoom); + bool isMonster = (id >= ittypes); - if(graphglyph()) { + if(graphglyph(isMonster)) { initquickqueue(); - if(id >= ittypes) { + if(isMonster) { eMonster m = eMonster(id - ittypes); double bsize = buttonsize * 2/3; if(m == moKrakenH) bsize /= 3; diff --git a/inventory.cpp b/inventory.cpp index e92d4783..ed0af515 100644 --- a/inventory.cpp +++ b/inventory.cpp @@ -534,7 +534,7 @@ EX namespace inv { ld py = current_display->ycenter + pos.second * rad3; int icol = iinf[o].color; if(!remaining[i]) icol = gradient(icol, 0, 0, .5, 1); - bool gg = graphglyph(); + bool gg = graphglyph(false); if(!hiliteclick) { if(gg) {