From b30be9bc1275240d00beff23ee015b65a3e3389a Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 21 Nov 2021 00:25:22 +0100
Subject: [PATCH] - unlimited blockingpairs

---
 source/core/maphack.cpp                        | 8 ++++++--
 source/core/rendering/scene/hw_bunchdrawer.cpp | 5 ++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/source/core/maphack.cpp b/source/core/maphack.cpp
index d78214c4d..64332e575 100644
--- a/source/core/maphack.cpp
+++ b/source/core/maphack.cpp
@@ -41,7 +41,7 @@
 #include "mapinfo.h"
 
 static TArray<usermaphack_t> usermaphacks;
-TArray<int> blockingpairs[MAXWALLS];
+TArray<TArray<int>> blockingpairs;
 
 void AddUserMapHack(usermaphack_t& mhk)
 {
@@ -144,6 +144,10 @@ static int32_t LoadMapHack(const char *filename)
         {
             if (sc.CheckNumber() && validateWall())
             {
+                if (blockingpairs.Size() < (unsigned)numwalls)
+                {
+                    blockingpairs.Resize(numwalls);
+                }
                 blockingpairs[currentwall].Push(sc.Number);
             }
         }
@@ -376,8 +380,8 @@ static int32_t LoadMapHack(const char *filename)
 void G_LoadMapHack(const char* filename, const unsigned char* md4)
 {
     hw_ClearSplitSector();
+    blockingpairs.Reset();
 
-    for (auto& p : blockingpairs) p.Clear();
     FString internal = "engine/compatibility/";
     for (int j = 0; j < 16; ++j)
     {
diff --git a/source/core/rendering/scene/hw_bunchdrawer.cpp b/source/core/rendering/scene/hw_bunchdrawer.cpp
index 616f2f26b..485dfeffa 100644
--- a/source/core/rendering/scene/hw_bunchdrawer.cpp
+++ b/source/core/rendering/scene/hw_bunchdrawer.cpp
@@ -45,8 +45,7 @@
 #include "gamecontrol.h"
 #include "hw_sections.h"
 
-extern TArray<int> blockingpairs[MAXWALLS];
-
+extern TArray<TArray<int>> blockingpairs;
 //==========================================================================
 //
 //
@@ -301,7 +300,7 @@ void BunchDrawer::ProcessBunch(int bnch)
 			int ww = sectionLines[i].wall;
 			if (ww != -1)
 			{
-				for (auto p : blockingpairs[ww]) blockwall.Set(sectionLines[p].wall);
+				if (blockingpairs.Size() > 0) for (auto p : blockingpairs[ww]) blockwall.Set(sectionLines[p].wall);
 				show2dwall.Set(ww);
 
 				if (!gotwall[i])