From a614af8dbe42b5d1319a4c4e6063a1b52beaa143 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Fri, 25 Dec 2020 06:10:12 +0100 Subject: [PATCH] shmup: fixed redundant and incorrect revival of mirror spirits --- shmup.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/shmup.cpp b/shmup.cpp index 89cde3fb..3de18452 100644 --- a/shmup.cpp +++ b/shmup.cpp @@ -1829,12 +1829,10 @@ void moveBullet(monster *m, int delta) { // Orb of Winter protects from fireballs if(m->type == moFireball && ((isPlayer(m2) && markOrb(itOrbWinter)) || m2->type == moWitchWinter)) continue; - bool revive = m2->type == moMirrorSpirit && !m2->dead; - killMonster(m2, m->parent ? m->parent->type : moNone); - if(revive && m2->dead) { - hr::kills[moMirrorSpirit]--; + int ms = mirrorspirits; + killMonster(m2, m->get_parenttype()); + if(mirrorspirits > ms) { multi::kills[cpid]--; - mirrorspirits++; } if(m2->dead && m2->type == moAsteroid) { gainItem(itAsteroid);