mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-01 07:49:55 +00:00
Code Issues Releases Wiki Activity

Merge pull request #181 from jruderman/hud_kills

Browse Source 
Fix HUD kill list in 'items only' mode
This commit is contained in:
Zeno Rogue 2021-07-04 09:36:04 +02:00 committed by GitHub
commit 4e4b32f2bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hud.cpp
View File

@ -173,10 +173,10 @@ int glyphflags(int gid) {
return f; return f;
} }
EX bool graphglyph() { EX bool graphglyph(bool isMonster) {
// if(GDIM == 3) return false; // if(GDIM == 3) return false;
if(vrhr::active()) 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) { 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]; int d = ticks - glasttime[id];
double zoom = (d <= 250 && d >= 0) ? 1.25 - .001 * d : 1; double zoom = (d <= 250 && d >= 0) ? 1.25 - .001 * d : 1;
glsize = int(glsize * zoom); glsize = int(glsize * zoom);
bool isMonster = (id >= ittypes);
if(graphglyph()) { if(graphglyph(isMonster)) {
initquickqueue(); initquickqueue();
if(id >= ittypes) { if(isMonster) {
eMonster m = eMonster(id - ittypes); eMonster m = eMonster(id - ittypes);
double bsize = buttonsize * 2/3; double bsize = buttonsize * 2/3;
if(m == moKrakenH) bsize /= 3; if(m == moKrakenH) bsize /= 3;

2
inventory.cpp
View File

@ -534,7 +534,7 @@ EX namespace inv {
ld py = current_display->ycenter + pos.second * rad3; ld py = current_display->ycenter + pos.second * rad3;
int icol = iinf[o].color; int icol = iinf[o].color;
if(!remaining[i]) icol = gradient(icol, 0, 0, .5, 1); if(!remaining[i]) icol = gradient(icol, 0, 0, .5, 1);
bool gg = graphglyph(); bool gg = graphglyph(false);
if(!hiliteclick) { if(!hiliteclick) {
if(gg) { if(gg) {