Allow player-only over/under

MrAlaux · Nov 28, 2023 · a645004 · a645004
1 parent 9798050
commit a645004
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/m_menu.c b/src/m_menu.c
@@ -4840,6 +4840,10 @@ setup_menu_t gen_settings5[] = { // General Settings screen5
 
 // [Nugget] /-----------------------------------------------------------------
 
+static const char *over_under_str[] = {
+  "Off", "Player Only", "All Things", NULL
+};
+
 static const char *impact_pitch_str[] = {
   "Off", "Fall", "Damage", "Both", NULL
 };
@@ -4852,8 +4856,8 @@ setup_menu_t gen_settings6[] = {
 
   {"Nugget - Gameplay", S_SKIP|S_TITLE, m_null, M_X, M_Y + gen6_title1 * M_SPC},
 
-    {"Things Move Over/Under Things", S_YESNO|S_STRICT|S_CRITICAL, m_null, M_X, M_Y + gen6_overunder   * M_SPC, {"over_under"}},
-    {"Allow Jumping/Crouching",       S_YESNO|S_STRICT|S_CRITICAL, m_null, M_X, M_Y + gen6_jump_crouch * M_SPC, {"jump_crouch"}},
+    {"Move Over/Under Things",        S_CHOICE|S_STRICT|S_CRITICAL, m_null, M_X, M_Y + gen6_overunder   * M_SPC, {"over_under"}, 0, NULL, over_under_str},
+    {"Allow Jumping/Crouching",       S_YESNO |S_STRICT|S_CRITICAL, m_null, M_X, M_Y + gen6_jump_crouch * M_SPC, {"jump_crouch"}},
 
   {"",              S_SKIP,         m_null, M_X, M_Y + gen6_stub1  * M_SPC},
   {"Nugget - View", S_SKIP|S_TITLE, m_null, M_X, M_Y + gen6_title2 * M_SPC},

diff --git a/src/m_misc.c b/src/m_misc.c
@@ -719,8 +719,8 @@ default_t defaults[] = {
   {
     "over_under",
     (config_t *) &over_under, NULL,
-    {0}, {0,1}, number, ss_gen, wad_yes,
-    "1 to allow things to move over/under other things"
+    {0}, {0,2}, number, ss_gen, wad_yes,
+    "Allow movement over/under things (1 = Player only, 2 = All things)"
   },
 
   {

diff --git a/src/p_map.c b/src/p_map.c
@@ -546,6 +546,7 @@ static boolean PIT_CheckThing(mobj_t *thing) // killough 3/26/98: make static
   // [Nugget]: [DSDA] check if a mobj passed over/under another object
   if (casual_play && over_under
       && (tmthing->flags & MF_SOLID) && !(thing->flags & MF_SPECIAL)
+      && ((over_under == 2) || tmthing->player || thing->player)
       && (   (  thing->z +   thing->height <= tmthing->z)   // Over
           || (tmthing->z + tmthing->height <=   thing->z))) // Under
   {