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

Merge pull request #482 from josephcsible/kind_outline

Browse Source 
Simplify kind_outline and remove duplicate code of it from cellcolor
This commit is contained in:
Zeno Rogue
2025-11-11 19:09:36 +01:00
committed by GitHub
parent ab714bb2dc 1c5ecac670
commit 8bb576e592
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
graph.cpp
View File

@@ -143,13 +143,14 @@ EX transmatrix at_smart_lof(const transmatrix& V, ld lev) {
EX shiftmatrix at_smart_lof(const shiftmatrix& V, ld lev) { return shiftless(at_smart_lof(V.T, lev), V.shift); } EX shiftmatrix at_smart_lof(const shiftmatrix& V, ld lev) { return shiftless(at_smart_lof(V.T, lev), V.shift); }
EX color_t kind_outline(eItem it) { EX color_t kind_outline(eItem it) {
int k = itemclass(it); switch(itemclass(it)) {
if(k == IC_TREASURE) case IC_TREASURE:
return OUTLINE_TREASURE; return OUTLINE_TREASURE;
else if(k == IC_ORB) case IC_ORB:
return OUTLINE_ORB; return OUTLINE_ORB;
else default:
return OUTLINE_OTHER; return OUTLINE_OTHER;
}
} }
/** should objects fly slightly up and down in product/twisted product geometries */ /** should objects fly slightly up and down in product/twisted product geometries */
@@ -195,15 +196,8 @@ EX int cellcolor(cell *c) {
if(c->wall == waMirror) return c->land == laMirror ? OUTLINE_TREASURE : OUTLINE_ORB; if(c->wall == waMirror) return c->land == laMirror ? OUTLINE_TREASURE : OUTLINE_ORB;
if(c->item && !itemHiddenFromSight(c)) { if(c->item && !itemHiddenFromSight(c))
int k = itemclass(c->item); return kind_outline(c->item);
if(k == IC_TREASURE)
return OUTLINE_TREASURE;
else if(k == IC_ORB)
return OUTLINE_ORB;
else
return OUTLINE_OTHER;
}
return OUTLINE_NONE; return OUTLINE_NONE;
} }