Separate "Player Trail Mode" Option

andrikpowell · Feb 14, 2025 · 22c1f82 · 22c1f82
1 parent 7bcc657
commit 22c1f82
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/prboom2/src/am_map.c b/prboom2/src/am_map.c
@@ -352,6 +352,7 @@ typedef struct
 static trailpoint_t player_trail[TRAIL_SIZE];
 static int trail_index;
 static int trail_size;
+static int trail_collisions;
 static int trail_size_max;
 
 map_trail_mode_t map_trail_mode;
@@ -642,7 +643,8 @@ void AM_initPlayerTrail(void)
   trail_index = -1;
   trail_size = 0;
   trail_size_max = dsda_IntConfig(dsda_config_map_trail_size);
-  map_trail_mode = dsda_IntConfig(dsda_config_map_trail_mode);
+  trail_collisions = dsda_IntConfig(dsda_config_map_trail_collisions) ? map_trail_mode_include_collisions : map_trail_mode_ignore_collisions;
+  map_trail_mode = dsda_IntConfig(dsda_config_map_trail) ? trail_collisions : false;
 }
 
 //

diff --git a/prboom2/src/dsda/configuration.c b/prboom2/src/dsda/configuration.c
@@ -1037,9 +1037,13 @@ dsda_config_t dsda_config[dsda_config_count] = {
     "map_title", dsda_config_map_title,
     CONF_BOOL(1), NULL, NOT_STRICT, dsda_RefreshMapTitle
   },
-  [dsda_config_map_trail_mode] = {
-    "map_trail_mode", dsda_config_map_trail_mode,
-    dsda_config_int, 0, map_trail_mode_max - 1, { 0 }, NULL, NOT_STRICT, AM_initPlayerTrail
+  [dsda_config_map_trail] = {
+    "map_trail", dsda_config_map_trail,
+    CONF_BOOL(0), NULL, NOT_STRICT, AM_initPlayerTrail
+  },
+  [dsda_config_map_trail_collisions] = {
+    "map_trail_collisions", dsda_config_map_trail_collisions,
+    CONF_BOOL(0), NULL, NOT_STRICT, AM_initPlayerTrail
   },
   [dsda_config_map_trail_size] = {
     "map_trail_size", dsda_config_map_trail_size,

diff --git a/prboom2/src/dsda/configuration.h b/prboom2/src/dsda/configuration.h
@@ -230,7 +230,8 @@ typedef enum {
   dsda_config_map_totals,
   dsda_config_map_time,
   dsda_config_map_title,
-  dsda_config_map_trail_mode,
+  dsda_config_map_trail,
+  dsda_config_map_trail_collisions,
   dsda_config_map_trail_size,
   dsda_config_automap_overlay,
   dsda_config_automap_rotate,

diff --git a/prboom2/src/m_menu.c b/prboom2/src/m_menu.c
@@ -2775,14 +2775,6 @@ static const char *map_things_appearance_list[] =
   NULL
 };
 
-static const char *map_trail_mode_list[] =
-{
-  "off",
-  "ignore collisions",
-  "include collisions",
-  NULL
-};
-
 setup_menu_t auto_settings1[] =  // 1st AutoMap Settings screen
 {
   { "Automap Components", S_SKIP | S_TITLE, m_null, AU_X},
@@ -2810,13 +2802,12 @@ setup_menu_t auto_settings1[] =  // 1st AutoMap Settings screen
   FINAL_ENTRY
 };
 
-#define AU_X2 180
-
 setup_menu_t auto_settings2[] =  // 2st AutoMap Settings screen
 {
-  { "Tools", S_SKIP | S_TITLE, m_null, AU_X2},
-  { "Player Trail Mode", S_CHOICE, m_conf, AU_X2, dsda_config_map_trail_mode, 0, map_trail_mode_list },
-  { "Player Trail Size", S_NUM, m_conf, AU_X2, dsda_config_map_trail_size },
+  { "Tools", S_SKIP | S_TITLE, m_null, AU_X},
+  { "Player Trail", S_YESNO, m_conf, AU_X, dsda_config_map_trail },
+  { "Include Collisions", S_YESNO, m_conf, AU_X, dsda_config_map_trail_collisions },
+  { "Player Trail Size", S_NUM, m_conf, AU_X, dsda_config_map_trail_size },
   EMPTY_LINE,
   EMPTY_LINE,
   {"background", S_COLOR, m_conf, AU_X, dsda_config_mapcolor_back},

diff --git a/prboom2/src/m_misc.c b/prboom2/src/m_misc.c
@@ -237,7 +237,8 @@ cfg_def_t cfg_defs[] =
   MIGRATED_SETTING(dsda_config_map_totals),
   MIGRATED_SETTING(dsda_config_map_time),
   MIGRATED_SETTING(dsda_config_map_title),
-  MIGRATED_SETTING(dsda_config_map_trail_mode),
+  MIGRATED_SETTING(dsda_config_map_trail),
+  MIGRATED_SETTING(dsda_config_map_trail_collisions),
   MIGRATED_SETTING(dsda_config_map_trail_size),
   MIGRATED_SETTING(dsda_config_automap_overlay),
   MIGRATED_SETTING(dsda_config_automap_rotate),