1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 01:20:37 +00:00

properly colored Mimic particles; no falling animations for Mimics

This commit is contained in:
Zeno Rogue 2018-02-12 00:07:07 +01:00
parent bcf5e984ad
commit 0456f2945c

View File

@ -1932,7 +1932,9 @@ void killMonster(cell *c, eMonster who, flagtype deathflags) {
} }
if(isWorm(c) && m != moTentacleGhost) return; if(isWorm(c) && m != moTentacleGhost) return;
int pcount = (deathflags & AF_FALL) ? 0 : 16; bool fallanim = (deathflags & AF_FALL) && m != moMimic;
int pcount = fallanim ? 0 : 16;
if(m == moShadow) return; if(m == moShadow) return;
#ifdef HASLINEVIEW #ifdef HASLINEVIEW
@ -2221,10 +2223,20 @@ void killMonster(cell *c, eMonster who, flagtype deathflags) {
airmap.push_back(make_pair(dcal[i],0)); airmap.push_back(make_pair(dcal[i],0));
buildAirmap(); buildAirmap();
} }
if(m == moMimic) {
for(auto& m: mirror::mirrors) if(c == m.second.c) {
drawParticles(c, mirrorcolor(m.second.mirrored), pcount);
if(c->wall == waMirrorWall)
drawParticles(c, mirrorcolor(!m.second.mirrored), pcount);
}
pcount = 0;
}
drawParticles(c, minf[m].color, pcount); drawParticles(c, minf[m].color, pcount);
if(deathflags & AF_FALL) if(fallanim) {
fallingMonsterAnimation(c, m); fallingMonsterAnimation(c, m);
} }
}
void fightmessage(eMonster victim, eMonster attacker, bool stun, flagtype flags) { void fightmessage(eMonster victim, eMonster attacker, bool stun, flagtype flags) {