Rework Game Modifiers to be temporary (#724)

Author: andrikpowell

prboom2/src/d_main.c

@@ -137,6 +137,8 @@ dboolean nomonsters;     // working -nomonsters
 dboolean respawnparm;    // working -respawn
 dboolean fastparm;       // working -fast
 
+dboolean pistolstart;
+
 dboolean randomclass;
 
 dboolean singletics = false; // debug flag to cancel adaptiveness
@@ -2155,6 +2157,7 @@ static void D_DoomMainSetup(void)
   dsda_LoadWadPreferences();
   dsda_LoadMapInfo();
   dsda_InitSkills();
+  dsda_InitGameModifiers(); // Set game modifiers based off args / persistent cfgs
 
   //jff 9/3/98 use logical output routine
   lprintf(LO_DEBUG, "\nP_Init: Init Playloop state.\n");

prboom2/src/doomstat.h

@@ -74,6 +74,8 @@ extern complevel_t compatibility_level;
 
 extern int demo_insurance;      // killough 4/5/98
 
+extern dboolean pistolstart;
+
 // -------------------------------------------
 // killough 10/98: compatibility vector
 

prboom2/src/dsda/args.c

@@ -198,7 +198,7 @@ static arg_config_t arg_config[dsda_arg_count] = {
     "play single player with coop thing spawns",
     arg_null,
   },
-  [dsda_arg_pistolstart] = {
+  [dsda_arg_pistol_start] = {
     "-pistolstart", "-wandstart", NULL,
     "automatically pistol start each map",
     arg_null,

prboom2/src/dsda/args.h

@@ -50,7 +50,7 @@ typedef enum {
   dsda_arg_dsdademo,
   dsda_arg_solo_net,
   dsda_arg_coop_spawns,
-  dsda_arg_pistolstart,
+  dsda_arg_pistol_start,
   dsda_arg_chain_episodes,
   dsda_arg_stroller,
   dsda_arg_turbo,

prboom2/src/dsda/configuration.c

@@ -135,6 +135,8 @@ void dsda_InitExHud(void);
 void dsda_UpdateFreeText(void);
 void dsda_ResetAirControl(void);
 void dsda_AlterGameFlags(void);
+void dsda_RefreshPistolStart(void);
+void dsda_RefreshAlwaysPistolStart(void);
 
 void dsda_TrackConfigFeatures(void) {
   if (!demorecording)
@@ -983,7 +985,11 @@ dsda_config_t dsda_config[dsda_config_count] = {
   },
   [dsda_config_pistol_start] = {
     "dsda_pistol_start", dsda_config_pistol_start,
-    CONF_BOOL(0), NULL, NOT_STRICT
+    CONF_BOOL(0), NULL, NOT_STRICT, dsda_RefreshPistolStart
+  },
+  [dsda_config_always_pistol_start] = {
+    "dsda_always_pistol_start", dsda_config_always_pistol_start,
+    CONF_BOOL(0), NULL, NOT_STRICT, dsda_RefreshAlwaysPistolStart
   },
   [dsda_config_respawn_monsters] = {
     "dsda_respawn_monsters", dsda_config_respawn_monsters,

prboom2/src/dsda/configuration.h

@@ -215,6 +215,7 @@ typedef enum {
   dsda_config_quickstart_cache_tics,
   dsda_config_death_use_action,
   dsda_config_allow_jumping,
+  dsda_config_always_pistol_start,
   dsda_config_pistol_start,
   dsda_config_respawn_monsters,
   dsda_config_fast_monsters,

prboom2/src/dsda/demo.c

@@ -277,7 +277,7 @@ void dsda_InitDemoRecording(void) {
     I_Error("You must specify a skill level when recording a demo!\n"
             "Example: dsda-doom -iwad DOOM -complevel 3 -skill 4 -record demo");
 
-  if (dsda_Flag(dsda_arg_pistolstart))
+  if (dsda_Flag(dsda_arg_pistol_start))
     I_Error("The -pistolstart option is not allowed when recording a demo!");
 
   demorecording = true;

prboom2/src/dsda/save.c

@@ -142,6 +142,38 @@ static void dsda_UnArchiveContext(void) {
   true_basetic = gametic - true_logictic_value;
 }
 
+int saved_pistolstart, saved_respawnparm, saved_fastparm, saved_nomonsters, saved_coop_spawns;
+
+void dsda_ArchiveGameModifiers(void)
+{
+  saved_pistolstart = pistolstart;
+  saved_respawnparm = respawnparm;
+  saved_fastparm    = fastparm;
+  saved_nomonsters  = nomonsters;
+  saved_coop_spawns = coop_spawns;
+
+  P_SAVE_X(saved_pistolstart);
+  P_SAVE_X(saved_respawnparm);
+  P_SAVE_X(saved_fastparm);
+  P_SAVE_X(saved_nomonsters);
+  P_SAVE_X(saved_coop_spawns);
+}
+
+void dsda_UnArchiveGameModifiers(void)
+{
+  P_LOAD_X(saved_pistolstart);
+  P_LOAD_X(saved_respawnparm);
+  P_LOAD_X(saved_fastparm);
+  P_LOAD_X(saved_nomonsters);
+  P_LOAD_X(saved_coop_spawns);
+
+  dsda_UpdateIntConfig(dsda_config_pistol_start,     saved_pistolstart, true);
+  dsda_UpdateIntConfig(dsda_config_respawn_monsters, saved_respawnparm, true);
+  dsda_UpdateIntConfig(dsda_config_fast_monsters,    saved_fastparm,    true);
+  dsda_UpdateIntConfig(dsda_config_no_monsters,      saved_nomonsters,  true);
+  dsda_UpdateIntConfig(dsda_config_coop_spawns,      saved_coop_spawns, true);
+}
+
 void dsda_ArchiveAll(void) {
   dsda_ArchiveContext();
 
@@ -159,6 +191,7 @@ void dsda_ArchiveAll(void) {
   P_ArchiveRNG();
   P_ArchiveMap();
 
+  dsda_ArchiveGameModifiers();
   dsda_ArchiveInternal();
 }
 
@@ -179,6 +212,7 @@ void dsda_UnArchiveAll(void) {
   P_UnArchiveMap();
   P_MapEnd();
 
+  dsda_UnArchiveGameModifiers();
   dsda_UnArchiveInternal();
 }
 

prboom2/src/dsda/skill_info.c

@@ -221,23 +221,67 @@ void dsda_InitSkills(void) {
   }
 }
 
-static void dsda_ResetGameFlags(void)
+// At startup, set-up temp game modifier configs based off args / persistent cfgs
+// Only set once, as modifiers can break away from args
+//
+// "Always Pistol Start" is the only persistent cfg (saved in cfg file)
+//
+
+void dsda_InitGameModifiers(void)
+{
+  if (dsda_Flag(dsda_arg_pistol_start) || dsda_IntConfig(dsda_config_always_pistol_start))
+      dsda_UpdateIntConfig(dsda_config_pistol_start, true, true);
+  if (dsda_Flag(dsda_arg_respawn))
+      dsda_UpdateIntConfig(dsda_config_respawn_monsters, true, true);
+  if (dsda_Flag(dsda_arg_fast))
+      dsda_UpdateIntConfig(dsda_config_fast_monsters, true, true);
+  if (dsda_Flag(dsda_arg_nomonsters))
+      dsda_UpdateIntConfig(dsda_config_no_monsters, true, true);
+  if (dsda_Flag(dsda_arg_coop_spawns))
+      dsda_UpdateIntConfig(dsda_config_coop_spawns, true, true);
+}
+
+// if "Pistol Start" is disabled, disable "Always Pistol Start" (avoid impossible condition)
+void dsda_RefreshPistolStart(void)
+{
+  dboolean pistol_start_conflict = dsda_IntConfig(dsda_config_always_pistol_start) && !dsda_IntConfig(dsda_config_pistol_start);
+
+  if (allow_incompatibility || in_game)
+    if (pistol_start_conflict)
+    {
+      dsda_UpdateIntConfig(dsda_config_always_pistol_start, false, true);
+      dsda_ResetGameModifiers();
+    }
+}
+
+// if "Always Pistol Start" is enabled, enable "Pistol Start" (avoid impossible condition)
+void dsda_RefreshAlwaysPistolStart(void)
+{
+  dboolean pistol_start_conflict = dsda_IntConfig(dsda_config_always_pistol_start) && !dsda_IntConfig(dsda_config_pistol_start);
+
+  if (allow_incompatibility || in_game)
+    if (pistol_start_conflict)
+    {
+      dsda_UpdateIntConfig(dsda_config_pistol_start, true, true);
+      dsda_ResetGameModifiers();
+    }
+}
+
+// During demo recording/playback only use args, else use cfgs
+void dsda_ResetGameModifiers(void)
 {
-  respawnparm = dsda_Flag(dsda_arg_respawn) ||
-                (allow_incompatibility && dsda_IntConfig(dsda_config_respawn_monsters));
-  fastparm = dsda_Flag(dsda_arg_fast) ||
-             (allow_incompatibility && dsda_IntConfig(dsda_config_fast_monsters));
-  nomonsters = dsda_Flag(dsda_arg_nomonsters) ||
-             (allow_incompatibility && dsda_IntConfig(dsda_config_no_monsters));
-  coop_spawns = dsda_Flag(dsda_arg_coop_spawns) ||
-                (allow_incompatibility && dsda_IntConfig(dsda_config_coop_spawns));
+  pistolstart = (allow_incompatibility ? dsda_IntConfig(dsda_config_pistol_start)     : false);   // pistolstart not allowed in demos
+  respawnparm = (allow_incompatibility ? dsda_IntConfig(dsda_config_respawn_monsters) : dsda_Flag(dsda_arg_respawn));
+  fastparm    = (allow_incompatibility ? dsda_IntConfig(dsda_config_fast_monsters)    : dsda_Flag(dsda_arg_fast));
+  nomonsters  = (allow_incompatibility ? dsda_IntConfig(dsda_config_no_monsters)      : dsda_Flag(dsda_arg_nomonsters));
+  coop_spawns = (allow_incompatibility ? dsda_IntConfig(dsda_config_coop_spawns)      : dsda_Flag(dsda_arg_coop_spawns));
 }
 
 void dsda_RefreshGameSkill(void) {
   void G_RefreshFastMonsters(void);
 
   if (allow_incompatibility)
-    dsda_ResetGameFlags();
+    dsda_ResetGameModifiers();
 
   skill_info = skill_infos[gameskill];
 

prboom2/src/dsda/skill_info.h

@@ -60,5 +60,9 @@ void dsda_InitSkills(void);
 void dsda_RefreshGameSkill(void);
 void dsda_UpdateGameSkill(int skill);
 void dsda_AlterGameFlags(void);
+void dsda_InitGameModifiers(void);
+void dsda_ResetGameModifiers(void);
+void dsda_RefreshPistolStart(void);
+void dsda_RefreshAlwaysPistolStart(void);
 
 #endif