[Change] Don't abort autonav if damage is from volatile system.

This commit is contained in:
Allanis 2014-05-21 21:32:57 +01:00
parent 55a0cb0552
commit 7cb8dfd1f8

View File

@ -455,7 +455,7 @@ void pilot_hit(Pilot* p, const Solid* w, const unsigned int shooter,
/* Calculate the damage. */
outfit_calcDamage(&damage_shield, &damage_armour, &knockback, dtype, damage);
if((p->id == PLAYER_ID) &&
if((w != NULL) && (p->id == PLAYER_ID) &&
!pilot_isFlag(player, PILOT_HYP_BEGIN) &&
!pilot_isFlag(player, PILOT_HYPERSPACE))
player_abortAutonav("Sustaining Damage");