zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 21:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #419 from alexey-lysiuk/spawnspot_nomonsters

Browse source 
'no monsters' option is no longer ignored in ACS Spawn functions
This commit is contained in:
coelckers 2015-10-18 21:03:48 +02:00
commit 117783a785
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_acs.cpp
View file

@ -3365,6 +3365,14 @@ int DLevelScript::DoSpawn (int type, fixed_t x, fixed_t y, fixed_t z, int tid, i
if (info != NULL) if (info != NULL)
{ {
info = info->GetReplacement ();
if ((GetDefaultByType (info)->flags3 & MF3_ISMONSTER) &&
((dmflags & DF_NO_MONSTERS) || (level.flags2 & LEVEL2_NOMONSTERS)))
{
return 0;
}
actor = Spawn (info, x, y, z, ALLOW_REPLACE); actor = Spawn (info, x, y, z, ALLOW_REPLACE);
if (actor != NULL) if (actor != NULL)
{ {