OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/Edward850/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2014-04-15 09:22:50 +02:00
commit 4e683d360d
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/p_enemy.cpp
View file

@ -2527,8 +2527,9 @@ static bool P_CheckForResurrection(AActor *self, bool usevilestates)
if (!(corpsehit->flags & MF_CORPSE) )
continue; // not a monster
if (corpsehit->tics != -1)
continue; // not lying still yet
if (corpsehit->tics != -1 && // not lying still yet
!corpsehit->state->GetCanRaise()) // or not ready to be raised yet
continue;
raisestate = corpsehit->FindState(NAME_Raise);
if (raisestate == NULL)