Add comp_ledgeblock

kraflab · Apr 7, 2021 · 4423cbc · 4423cbc
1 parent 520e7d1
commit 4423cbc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/prboom2/src/doomstat.h b/prboom2/src/doomstat.h
@@ -122,7 +122,7 @@ enum {
   comp_translucency,
 
   // mbf21
-  comp_placeholder_29,
+  comp_ledgeblock,
   comp_placeholder_30,
   comp_placeholder_31,
   comp_placeholder_32,

diff --git a/prboom2/src/dsda/options.c b/prboom2/src/dsda/options.c
@@ -93,7 +93,8 @@ static const dsda_options_t default_mbf_options = {
   // .comp_maskedanim = 0,
   // .comp_ouchface = 1,
   // .comp_maxhealth = 0,
-  // .comp_translucency = 0
+  // .comp_translucency = 0,
+  // .comp_ledgeblock = 0
 };
 
 static const dsda_options_t default_latest_options = {
@@ -137,7 +138,8 @@ static const dsda_options_t default_latest_options = {
   .comp_maskedanim = 0,
   .comp_ouchface = 0,
   .comp_maxhealth = 0,
-  .comp_translucency = 0
+  .comp_translucency = 0,
+  .comp_ledgeblock = 1
 };
 
 static dsda_options_t mbf_options;

diff --git a/prboom2/src/dsda/options.h b/prboom2/src/dsda/options.h
@@ -58,7 +58,7 @@ typedef struct dsda_options {
   int comp_ouchface;
   int comp_maxhealth;
   int comp_translucency;
-  // int comp_29;
+  int comp_ledgeblock;
   // int comp_30;
   // int comp_31;
   // int comp_32;

diff --git a/prboom2/src/g_game.c b/prboom2/src/g_game.c
@@ -2658,8 +2658,8 @@ void G_Compatibility(void)
     { boom_compatibility_compatibility, prboom_6_compatibility },
     // comp_translucency - No predefined translucency for some things
     { boom_compatibility_compatibility, prboom_6_compatibility },
-    // comp_placeholder_29 - Not defined yet
-    { 255, 255 },
+    // comp_ledgeblock - ground monsters are blocked by ledges
+    { boom_compatibility, mbf21_compatibility },
     // comp_placeholder_30 - Not defined yet
     { 255, 255 },
     // comp_placeholder_31 - Not defined yet

diff --git a/prboom2/src/p_map.c b/prboom2/src/p_map.c
@@ -995,7 +995,7 @@ dboolean P_TryMove(mobj_t* thing,fixed_t x,fixed_t y,
      */
     if (!(thing->flags & (MF_DROPOFF|MF_FLOAT)))
     {
-      if (comp[comp_dropoff])
+      if (comp[comp_dropoff] || comp[comp_ledgeblock])
       {
         // e6y
         // Fix demosync bug in mbf compatibility mode
@@ -1007,7 +1007,7 @@ dboolean P_TryMove(mobj_t* thing,fixed_t x,fixed_t y,
         // http://www.doomworld.com/idgames/index.php?id=11138
         if (
           (
-            compatibility ||
+            comp[comp_ledgeblock] ||
             !dropoff ||
             (
               !prboom_comp[PC_NO_DROPOFF].state &&