- Changed PowerFlight so that Hexen's infiniteness is not controlled by being
in a hub but by a level flag instead. - Fixed: Floor and ceiling huggers must set themselves to floor and ceiling each time they move. - Added a LEVEL_NOMONSTERS flag so that G_ChangeLevel doesn't have to mess with the dmflags CVAR to start the level without monsters. SVN r563 (trunk)
This commit is contained in:
parent
8f5dd5d028
commit
621fe2ed98
13 changed files with 60 additions and 14 deletions
|
|
@ -67,7 +67,8 @@ bool P_Thing_Spawn (int tid, AActor *source, int type, angle_t angle, bool fog,
|
|||
// Handle decorate replacements.
|
||||
kind = kind->ActorInfo->GetReplacement()->Class;
|
||||
|
||||
if ((GetDefaultByType (kind)->flags3 & MF3_ISMONSTER) && (dmflags & DF_NO_MONSTERS))
|
||||
if ((GetDefaultByType (kind)->flags3 & MF3_ISMONSTER) &&
|
||||
((dmflags & DF_NO_MONSTERS) || (level.flags & LEVEL_NOMONSTERS)))
|
||||
return false;
|
||||
|
||||
if (tid == 0)
|
||||
|
|
@ -202,7 +203,8 @@ bool P_Thing_Projectile (int tid, AActor *source, int type, const char * type_na
|
|||
kind = kind->ActorInfo->GetReplacement()->Class;
|
||||
|
||||
defflags3 = GetDefaultByType (kind)->flags3;
|
||||
if ((defflags3 & MF3_ISMONSTER) && (dmflags & DF_NO_MONSTERS))
|
||||
if ((defflags3 & MF3_ISMONSTER) &&
|
||||
((dmflags & DF_NO_MONSTERS) || (level.flags & LEVEL_NOMONSTERS)))
|
||||
return false;
|
||||
|
||||
if (tid == 0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue