Merge pull request #2079 from Citadel-Station-13/upstream-merge-29344

[MIRROR] Drakes dying during the brief part of the swoop where they can be damaged will properly reset transform and alpha
2017-07-19 13:30:44 -05:00
parent 27b826a6f1 62f633a1ad
commit 44ce24476a
1 changed files with 3 additions and 1 deletions
@@ -191,7 +191,9 @@ Difficulty: Medium
 		sleep(1)
 		if(QDELETED(src) || stat == DEAD) //we got hit and died, rip us
 			qdel(F)
-			swooping &= ~SWOOP_DAMAGEABLE
+			if(stat == DEAD)
+				swooping &= ~SWOOP_DAMAGEABLE
+				animate(src, alpha = 255, transform = oldtransform, time = 0, flags = ANIMATION_END_NOW) //reset immediately
 			return
 	animate(src, alpha = 100, transform = matrix()*0.7, time = 7)
 	swooping |= SWOOP_INVULNERABLE