From d4ede67e1b0967ffe1110ada715a3c740029d682 Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Thu, 5 Mar 2020 19:40:46 +0100
Subject: [PATCH] Tools/MMaps: corrected hole format for terrain builder

---
 src/tools/mmaps_generator/TerrainBuilder.cpp | 15 ++++++++++-----
 src/tools/mmaps_generator/TerrainBuilder.h   |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp
index 23b0a19c63e..de2e0ed0588 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.cpp
+++ b/src/tools/mmaps_generator/TerrainBuilder.cpp
@@ -177,7 +177,7 @@ namespace MMAP
         }
 
         // data used later
-        uint8 holes[16][16][8];
+        uint16 holes[16][16];
         memset(holes, 0, sizeof(holes));
         uint16 liquid_entry[16][16];
         memset(liquid_entry, 0, sizeof(liquid_entry));
@@ -611,17 +611,22 @@ namespace MMAP
         coord[2] = v[index2];
     }
 
+    static uint16 holetab_h[4] = { 0x1111, 0x2222, 0x4444, 0x8888 };
+    static uint16 holetab_v[4] = { 0x000F, 0x00F0, 0x0F00, 0xF000 };
+
     /**************************************************************************/
-    bool TerrainBuilder::isHole(int square, uint8 const holes[16][16][8])
+    bool TerrainBuilder::isHole(int square, const uint16 holes[16][16])
     {
         int row = square / 128;
         int col = square % 128;
         int cellRow = row / 8;     // 8 squares per cell
         int cellCol = col / 8;
-        int holeRow = row % 8;
-        int holeCol = (square - (row * 128 + cellCol * 8));
+        int holeRow = row % 8 / 2;
+        int holeCol = (square - (row * 128 + cellCol * 8)) / 2;
 
-        return (holes[cellRow][cellCol][holeRow] & (1 << holeCol)) != 0;
+        uint16 hole = holes[cellRow][cellCol];
+
+        return (hole & holetab_h[holeCol] & holetab_v[holeRow]) != 0;
     }
 
     /**************************************************************************/
diff --git a/src/tools/mmaps_generator/TerrainBuilder.h b/src/tools/mmaps_generator/TerrainBuilder.h
index e530bbf8c9d..ca5264f81bc 100644
--- a/src/tools/mmaps_generator/TerrainBuilder.h
+++ b/src/tools/mmaps_generator/TerrainBuilder.h
@@ -112,7 +112,7 @@ namespace MMAP
             void getHeightTriangle(int square, Spot triangle, int* indices, bool liquid = false);
 
             /// Determines if the specific position's triangles should be rendered
-            bool isHole(int square, uint8 const holes[16][16][8]);
+            bool isHole(int square, uint16 const holes[16][16]);
 
             /// Get the liquid vector coordinate for a specific position
             void getLiquidCoord(int index, int index2, float xOffset, float yOffset, float* coord, float* v);