Add NOMONSTERS skill flag

Author: andrikpowell

prboom2/src/dsda/skill_info.c

@@ -244,6 +244,9 @@ void dsda_RefreshGameSkill(void) {
   if (respawnparm && !skill_info.respawn_time)
     skill_info.respawn_time = 12;
 
+  if (nomonsters)
+    skill_info.flags |= SI_NO_MONSTERS;
+
   if (fastparm)
     skill_info.flags |= SI_FAST_MONSTERS;
 

prboom2/src/dsda/skill_info.h

@@ -31,6 +31,7 @@
 #define SI_EASY_BOSS_BRAIN  0x0100
 #define SI_MUST_CONFIRM     0x0200
 #define SI_AUTO_USE_HEALTH  0x0400
+#define SI_NO_MONSTERS      0x1000
 
 typedef uint16_t skill_info_flags_t;
 

prboom2/src/dsda/wad_stats.c

@@ -268,14 +268,18 @@ void dsda_WadStatsExitMap(int missed_monsters) {
   int skill;
   int nightmare_skill;
   int best_normal_skill;
+  int nomo_flag;
 
   if (!current_map_stats || demoplayback)
     return;
 
   nightmare_skill = num_skills;
   best_normal_skill = num_skills - 1;   
 
-  if (!nomonsters) {
+  // Get conditions for recording wad stats
+  nomo_flag = skill_info.flags & SI_NO_MONSTERS;
+
+  if (!nomo_flag) {
     skill = gameskill + 1;
     if (skill > current_map_stats->best_skill) {
       if (current_map_stats->best_skill < best_normal_skill) {

prboom2/src/hexen/a_action.c

@@ -26,6 +26,7 @@
 #include "p_enemy.h"
 #include "p_tick.h"
 
+#include "dsda/skill_info.h"
 #include "hexen/p_things.h"
 
 #include "a_action.h"
@@ -118,7 +119,7 @@ void A_PotteryExplode(mobj_t * actor)
     S_StartMobjSound(mo, hexen_sfx_pottery_explode);
     if (actor->special_args[0])
     {                           // Spawn an item
-        if (!nomonsters
+        if (!(skill_info.flags & SI_NO_MONSTERS)
             || !(mobjinfo[TranslateThingType[actor->special_args[0]]].
                  flags & MF_COUNTKILL))
         {                       // Only spawn monsters if not -nomonsters
@@ -831,7 +832,7 @@ void A_SoAExplode(mobj_t * actor)
     {                           // Spawn an item
         // TODO: should this be on or off?
 #if 0 // Checks are not present in version 1.1
-        if (!nomonsters
+        if (!(skill_info.flags & SI_NO_MONSTERS))
             || !(mobjinfo[TranslateThingType[actor->special_args[0]]].
                  flags & MF_COUNTKILL))
 #endif

prboom2/src/hexen/p_things.c

@@ -23,6 +23,7 @@
 #include "p_inter.h"
 #include "p_tick.h"
 
+#include "dsda/skill_info.h"
 #include "hexen/a_action.h"
 
 #include "p_things.h"
@@ -159,7 +160,7 @@ dboolean EV_ThingProjectile(byte * args, dboolean gravity)
     searcher = -1;
     tid = args[0];
     moType = TranslateThingType[args[1]];
-    if (nomonsters && (mobjinfo[moType].flags & MF_COUNTKILL))
+    if ((skill_info.flags & SI_NO_MONSTERS) && (mobjinfo[moType].flags & MF_COUNTKILL))
     {                           // Don't spawn monsters if -nomonsters
         return false;
     }
@@ -209,7 +210,7 @@ dboolean EV_ThingSpawn(byte * args, dboolean fog)
     searcher = -1;
     tid = args[0];
     moType = TranslateThingType[args[1]];
-    if (nomonsters && (mobjinfo[moType].flags & MF_COUNTKILL))
+    if ((skill_info.flags & SI_NO_MONSTERS) && (mobjinfo[moType].flags & MF_COUNTKILL))
     {                           // Don't spawn monsters if -nomonsters
         return false;
     }

prboom2/src/p_mobj.c

@@ -1529,7 +1529,7 @@ dboolean P_SpawnProjectile(short thing_id, mobj_t *source, int spawn_num, angle_
 
   is_monster = (type == MT_SKULL || (mobjinfo[type].flags & MF_COUNTKILL));
 
-  if (nomonsters && is_monster)
+  if ((skill_info.flags & SI_NO_MONSTERS) && is_monster)
     return false;
 
   dsda_ResetThingIDSearch(&search);
@@ -1630,7 +1630,7 @@ dboolean P_SpawnThing(short thing_id, mobj_t *source, int spawn_num,
   if (type == num_mobj_types)
     return false;
 
-  if (nomonsters && (type == MT_SKULL || (mobjinfo[type].flags & MF_COUNTKILL)))
+  if ((skill_info.flags & SI_NO_MONSTERS) && (type == MT_SKULL || (mobjinfo[type].flags & MF_COUNTKILL)))
     return false;
 
   dsda_ResetThingIDSearch(&search);
@@ -2539,7 +2539,7 @@ mobj_t* P_SpawnMapThing (const mapthing_t* mthing, int index)
 
   // don't spawn any monsters if -nomonsters
 
-  if (nomonsters && (i == MT_SKULL || (mobjinfo[i].flags & MF_COUNTKILL)))
+  if ((skill_info.flags & SI_NO_MONSTERS) && (i == MT_SKULL || (mobjinfo[i].flags & MF_COUNTKILL)))
     return NULL;
 
   // spawn it