Skip to content

Commit 87f79a3

Browse files
committed
fix extra damage from explosive shotgun rounds
1 parent 53a566a commit 87f79a3

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

‎src/Battlescape/ProjectileFlyBState.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,11 +589,14 @@ void ProjectileFlyBState::think()
589589
}
590590
Explosion *explosion = new Explosion(proj->getPosition(offset), _ammo->getRules()->getHitAnimation());
591591
_parent->getMap()->getExplosions()->push_back(explosion);
592-
_parent->getSave()->getTileEngine()->hit(proj->getPosition(offset), _ammo->getRules()->getPower(), _ammo->getRules()->getDamageType(), _unit);
593592
if (_ammo->getRules()->getExplosionRadius() != 0)
594593
{
595594
_parent->getTileEngine()->explode(proj->getPosition(offset), _ammo->getRules()->getPower(), _ammo->getRules()->getDamageType(), _ammo->getRules()->getExplosionRadius(), _unit);
596595
}
596+
else
597+
{
598+
_parent->getSave()->getTileEngine()->hit(proj->getPosition(offset), _ammo->getRules()->getPower(), _ammo->getRules()->getDamageType(), _unit);
599+
}
597600
}
598601
}
599602
++i;

0 commit comments

Comments
 (0)