Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Allanis 2014-04-13 23:55:16 +01:00
commit e5dfc56750
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pilot.c
View File

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