mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-20 23:50:27 +00:00
Code Issues Releases Wiki Activity

Merge pull request #272 from jruderman/snake_high

Browse Source 
Fix highlight colors for snakes
This commit is contained in:
Zeno Rogue 2021-08-04 19:12:02 +02:00 committed by GitHub
commit 3af71a1388
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
graph.cpp
View File

@ -2550,12 +2550,15 @@ EX bool drawMonster(const shiftmatrix& Vparam, int ct, cell *c, color_t col, col
#if CAP_SHAPES #if CAP_SHAPES
bool darkhistory = history::includeHistory && history::inkillhistory.count(c); bool darkhistory = history::includeHistory && history::inkillhistory.count(c);
color_t outline = OUTLINE_NONE;
if(doHighlight())
poly_outline = if(doHighlight()) {
outline =
(isPlayerOn(c) || isFriendly(c)) ? OUTLINE_FRIEND : (isPlayerOn(c) || isFriendly(c)) ? OUTLINE_FRIEND :
noHighlight(c->monst) ? OUTLINE_NONE : noHighlight(c->monst) ? OUTLINE_NONE :
OUTLINE_ENEMY; OUTLINE_ENEMY;
poly_outline = outline;
}
// highlight faraway enemies if that's needed // highlight faraway enemies if that's needed
if (vid.faraway_highlight && c->cpdist >= 6 && vid.faraway_highlight <= get_threat_level(c)) { if (vid.faraway_highlight && c->cpdist >= 6 && vid.faraway_highlight <= get_threat_level(c)) {
@ -2677,6 +2680,8 @@ EX bool drawMonster(const shiftmatrix& Vparam, int ct, cell *c, color_t col, col
add_segment(taildist(c), [=] () { add_segment(taildist(c), [=] () {
for(int i=11; i>=0; i--) { for(int i=11; i>=0; i--) {
if(i < 3 && (c->monst == moTentacle || c->monst == moTentaclewait)) continue; if(i < 3 && (c->monst == moTentacle || c->monst == moTentaclewait)) continue;
if(doHighlight())
poly_outline = outline;
shiftmatrix Vbx = Vb; shiftmatrix Vbx = Vb;
if(WDIM == 2) Vbx = Vbx * spin(sin(M_PI * i / 6.) * wav / (i+.1)); if(WDIM == 2) Vbx = Vbx * spin(sin(M_PI * i / 6.) * wav / (i+.1));
Vbx = Vbx * xpush(length * (i) / 12.0); Vbx = Vbx * xpush(length * (i) / 12.0);