zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-06-04 19:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'gz/master' into thereisnospoon

Browse source
This commit is contained in:
ZZYZX 2017-02-06 14:14:23 +02:00
commit b7e64a2bc5
9 changed files with 87 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/p_mobj.cpp
View file

@ -3197,6 +3197,7 @@ void P_NightmareRespawn (AActor *mobj)
// spawn it
mo = AActor::StaticSpawn(mobj->GetClass(), DVector3(mobj->SpawnPoint.X, mobj->SpawnPoint.Y, z), NO_REPLACE, true);
mo->health = mobj->SpawnHealth();
if (z == ONFLOORZ)
{