OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Small fix: prevent various player animations from ever triggering when dead

Browse source
This commit is contained in:
Marisa the Magician 2019-09-27 21:08:05 +02:00
commit cd72ee9688
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
zscript/utcommon.zsc
View file

@ -731,6 +731,7 @@ Class UTPlayer : DoomPlayer
override void PlayIdle() override void PlayIdle()
{ {
if ( player.Health <= 0 ) return;
if ( (player && (player.mo == self)) && (player.crouchdir == -1) ) if ( (player && (player.mo == self)) && (player.crouchdir == -1) )
{ {
// Crouching // Crouching
@ -794,6 +795,7 @@ Class UTPlayer : DoomPlayer
override void PlayRunning() override void PlayRunning()
{ {
if ( player.Health <= 0 ) return;
if ( (player && (player.mo == self)) && (player.crouchdir == -1) ) if ( (player && (player.mo == self)) && (player.crouchdir == -1) )
{ {
// Crouching // Crouching
@ -843,6 +845,7 @@ Class UTPlayer : DoomPlayer
override void PlayAttacking() override void PlayAttacking()
{ {
if ( player.Health <= 0 ) return;
// no animation if crouched // no animation if crouched
if ( (player && (player.mo == self)) && (player.crouchdir == -1) ) return; if ( (player && (player.mo == self)) && (player.crouchdir == -1) ) return;
// check weapon type // check weapon type
@ -872,18 +875,21 @@ Class UTPlayer : DoomPlayer
virtual void PlayAttacking3() virtual void PlayAttacking3()
{ {
if ( player.Health <= 0 ) return;
if ( (player && (player.mo == self)) && (player.crouchdir == -1) ) return; if ( (player && (player.mo == self)) && (player.crouchdir == -1) ) return;
SetStateLabel("Missile"); SetStateLabel("Missile");
} }
virtual void PlayReloading() virtual void PlayReloading()
{ {
if ( player.Health <= 0 ) return;
if ( (player && (player.mo == self)) && (player.crouchdir == -1) ) return; if ( (player && (player.mo == self)) && (player.crouchdir == -1) ) return;
SetStateLabel("Reload"); SetStateLabel("Reload");
} }
virtual void PlayLanding() virtual void PlayLanding()
{ {
if ( player.Health <= 0 ) return;
if ( (player && (player.mo == self)) && (player.crouchdir == -1) ) return; if ( (player && (player.mo == self)) && (player.crouchdir == -1) ) return;
SetStateLabel("Landing"); SetStateLabel("Landing");
} }