From 4ee5474a8cbbc055c9a0f110b874435c4359990c Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fabian@greffrath.com>
Date: Sat, 13 Mar 2021 21:16:26 +0100
Subject: [PATCH] actually only build one P_CreateBlockMap() or the other

---
 Source/p_setup.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/Source/p_setup.c b/Source/p_setup.c
index 3bd816bd..a86d09d5 100644
--- a/Source/p_setup.c
+++ b/Source/p_setup.c
@@ -564,6 +564,8 @@ void P_LoadSideDefs2(int lump)
   Z_Free (data);
 }
 
+#ifndef MBF_STRICT
+
 // jff 10/6/98
 // New code added to speed up calculation of internal blockmap
 // Algorithm is order of nlines*(ncols+nrows) not nlines*ncols*nrows
@@ -608,10 +610,7 @@ static void AddBlockLine
   done[blockno] = 1;
 }
 
-#ifndef MBF_STRICT
-static
-#endif
-void P_CreateBlockMapBoom(void)
+static void P_CreateBlockMap(void)
 {
   int xorg,yorg;                 // blockmap origin (lower left)
   int nrows,ncols;               // blockmap dimensions
@@ -871,6 +870,8 @@ void P_CreateBlockMapBoom(void)
   free (blockdone);
 }
 
+#else // MBF_STRICT
+
 //
 // killough 10/98:
 //
@@ -884,10 +885,7 @@ void P_CreateBlockMapBoom(void)
 // Please note: This section of code is not interchangable with TeamTNT's
 // code which attempts to fix the same problem.
 
-#ifdef MBF_STRICT
-static
-#endif
-void P_CreateBlockMap(void)
+static void P_CreateBlockMap(void)
 {
   register int i;
   fixed_t minx = INT_MAX, miny = INT_MAX, maxx = INT_MIN, maxy = INT_MIN;
@@ -1036,6 +1034,8 @@ void P_CreateBlockMap(void)
   }
 }
 
+#endif // MBF_STRICT
+
 //
 // P_LoadBlockMap
 //
@@ -1052,11 +1052,7 @@ boolean P_LoadBlockMap (int lump)
 
   if (M_CheckParm("-blockmap") || (count = W_LumpLength(lump)/2) >= 0x10000 || count < 4) // [FG] always rebuild too short blockmaps
   {
-#ifdef MBF_STRICT
     P_CreateBlockMap();
-#else
-    P_CreateBlockMapBoom();
-#endif
   }
   else
     {