From a02a4ec3161e7481041c824f4e20c84e811a05c5 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Tue, 18 Jul 2023 17:57:51 -0600
Subject: [PATCH] imglib: fix wad3 loading (thanks to erysdren for the fix)

add a basic half-life test case (box map)
---
 CMakeLists.txt                |   2 +
 common/imglib.cc              |   2 +-
 testmaps.hh.in                |   2 +
 testmaps/deprecated/hlwad.wad | Bin 0 -> 6296 bytes
 testmaps/hl_basic.map         |  79 ++++++++++++++++++++++++++++++++++
 tests/test_qbsp.cc            |  20 +++++++++
 6 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 testmaps/deprecated/hlwad.wad
 create mode 100644 testmaps/hl_basic.map

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01b66a5e..dfeaece7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,6 +101,8 @@ find_package(TBB REQUIRED)
 
 set(TEST_QUAKE_MAP_EXPORT_DIR "" CACHE PATH "When running unit tests, export Quake maps to this directory (useful for testing in game)")
 set(TEST_QUAKE2_MAP_EXPORT_DIR "" CACHE PATH "When running unit tests, export Quake 2 maps to this directory (useful for testing in game)")
+set(TEST_HEXEN2_MAP_EXPORT_DIR "" CACHE PATH "When running unit tests, export Hexen 2 maps to this directory (useful for testing in game)")
+set(TEST_HALFLIFE_MAP_EXPORT_DIR "" CACHE PATH "When running unit tests, export Half-Life maps to this directory (useful for testing in game)")
 
 add_subdirectory(3rdparty)
 add_subdirectory(common)
diff --git a/common/imglib.cc b/common/imglib.cc
index aec33786..dc6484fe 100644
--- a/common/imglib.cc
+++ b/common/imglib.cc
@@ -220,7 +220,7 @@ std::optional<texture> load_mip(
         if (game->id == GAME_HALF_LIFE) {
             bool valid_mip_palette = true;
 
-            int32_t mip3_size = (header.width >> 3) + (header.height >> 3);
+            int32_t mip3_size = (header.width >> 3) * (header.height >> 3);
             size_t palette_size = sizeof(uint16_t) + (sizeof(qvec3b) * 256);
 
             if (header.offsets[3] <= 0) {
diff --git a/testmaps.hh.in b/testmaps.hh.in
index e5e7486a..267784dd 100644
--- a/testmaps.hh.in
+++ b/testmaps.hh.in
@@ -1,3 +1,5 @@
 inline const char *testmaps_dir = "@CMAKE_CURRENT_SOURCE_DIR@/testmaps";
 inline const char *test_quake_maps_dir = "@TEST_QUAKE_MAP_EXPORT_DIR@";
 inline const char *test_quake2_maps_dir = "@TEST_QUAKE2_MAP_EXPORT_DIR@";
+inline const char *test_hexen2_maps_dir = "@TEST_HEXEN2_MAP_EXPORT_DIR@";
+inline const char *test_halflife_maps_dir = "@TEST_HALFLIFE_MAP_EXPORT_DIR@";
diff --git a/testmaps/deprecated/hlwad.wad b/testmaps/deprecated/hlwad.wad
new file mode 100644
index 0000000000000000000000000000000000000000..6d75867e79a537894597d3961f2a1b39a226e051
GIT binary patch
literal 6296
zcmeI1e>7iZ9LHaiBuSEFGD#*$l9?ovNs^f)nItnIvu~1plbK91NkWp$gd|ClBuVz2
zBuSEFW+q9JB+1N7O82Yv&;FRxxo2nRbnfSz&;9kB=bYzxo%j2mbKiH%M%Q(#fH-}K
zkjcY#%Gnj@y-gM-m*XrvSGKvbwT0Fd`f^a5^GXm^3WccY3DSItpBMs?e#FpAko+gT
zzeEX0@}DStlK&+Ci4u_HKT-H3|4IH6B_PRvqVP%nTj~3M1-vWSR~kPvK#7mU=S&37
zwmzzhPpi`wQ~W=_-=B4=PVF=6Kb}zrt|*Txa2}|_`Je_DfI3_V8gLP4!o{Ekmw*tz
zUJ5#J83-|~kizQ06(Gd6tHA)S1VdN@MsO7v!_{B{*MKRk1v9vIIm^8cEZ};ugd4yL
zZUk$%32a~;*ur|SgPXw~ZUG0l6&zs$IKgepx$s7Cf!o0q?f^Hq6Wrl0@PJL=37f$S
z?gnqT2YldO@P+%p54M0m+z$cp00hE=5CmHx7`8zOJOrT-2I26qkWs^Sh=d&=gGV3=
z9))Ol3}Rp>$l-B_g(rku8+JiF?1lt*5)xq#B&n!8rK*~&ruMYDdWwd|UQNwZEv;v?
zwbOKTp4HV&*VB7WUq8dZ;CVyCOe3Q#W8-WSlNU@)bIi<MG&j$+uz1PRGSABDWozqv
z8=HN$wgq-}`|a%u9UNY9bS!dmDt2}*adCOo)wR^k?KOAzG7pc}Jw404yx#EkuJG}B
z)7Q7s&+jdN|Ehq1w*v#KgM!`(4z39ac{en)Haz^jh={t#$oFNk`lzT6qN5vPVm_41
z8)IWXii>NCk3S%!Ux|qalaiW~lRr*LX-Q4}BrUBqJ^j;+jJC|o&$6@Ib8<e<&F#p`
z`yxNTv!LM1!oseiqOVFyx=TyHE-ULPFaM^ZqPMd0P*qi5b@kzzn*Q3_BXxBH_4P*^
z8U`C1zinz7QYgM_ZXRxF`M$Mvq^<3T_V&?^jvqTa$GW<H>h2!z>G`?0ccQQFm;V0A
zfq`EK2d9RHej6U19vS(4baZBH?AZAD?8L<J$;r8?sT0%F^D{FiXJ;4Y=Kh$UUtC!D
cb8+#nrKP21Z6g!Jt876+|NeUruKuaN0sf|~ivR!s

literal 0
HcmV?d00001

diff --git a/testmaps/hl_basic.map b/testmaps/hl_basic.map
new file mode 100644
index 00000000..c5c5cd3a
--- /dev/null
+++ b/testmaps/hl_basic.map
@@ -0,0 +1,79 @@
+// Game: Half-Life
+// Format: Valve
+// entity 0
+{
+"mapversion" "220"
+"classname" "worldspawn"
+"wad" "deprecated/hlwad.wad"
+// brush 0
+{
+( -192 -64 -16 ) ( -192 -63 -16 ) ( -192 -64 -15 ) hltest [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( -64 -128 -16 ) ( -64 -128 -15 ) ( -63 -128 -16 ) hltest [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( -64 -64 -16 ) ( -63 -64 -16 ) ( -64 -63 -16 ) hltest [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
+( 64 64 16 ) ( 64 65 16 ) ( 65 64 16 ) hltest [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
+( 64 192 16 ) ( 65 192 16 ) ( 64 192 17 ) hltest [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( 256 64 16 ) ( 256 64 17 ) ( 256 65 16 ) hltest [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
+}
+// brush 1
+{
+( -192 -384 -16 ) ( -192 -383 -16 ) ( -192 -384 -15 ) hltest [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( -64 -144 -16 ) ( -64 -144 -15 ) ( -63 -144 -16 ) hltest [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( 64 -256 16 ) ( 65 -256 16 ) ( 64 -255 16 ) hltest [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
+( 64 -256 304 ) ( 64 -255 304 ) ( 65 -256 304 ) hltest [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
+( 64 -128 16 ) ( 65 -128 16 ) ( 64 -128 17 ) hltest [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( 256 -256 16 ) ( 256 -256 17 ) ( 256 -255 16 ) hltest [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
+}
+// brush 2
+{
+( -192 -48 -16 ) ( -192 -47 -16 ) ( -192 -48 -15 ) hltest [ 0 -1 0 16 ] [ 0 0 -1 0 ] 0 1 1
+( -64 192 -16 ) ( -64 192 -15 ) ( -63 192 -16 ) hltest [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( 64 80 16 ) ( 65 80 16 ) ( 64 81 16 ) hltest [ 1 0 0 0 ] [ 0 -1 0 16 ] 0 1 1
+( 64 80 304 ) ( 64 81 304 ) ( 65 80 304 ) hltest [ 1 0 0 0 ] [ 0 -1 0 16 ] 0 1 1
+( 64 208 16 ) ( 65 208 16 ) ( 64 208 17 ) hltest [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( 256 80 16 ) ( 256 80 17 ) ( 256 81 16 ) hltest [ 0 1 0 -16 ] [ 0 0 -1 0 ] 0 1 1
+}
+// brush 3
+{
+( -208 128 16 ) ( -208 129 16 ) ( -208 128 17 ) hltest [ -6.123233995736766e-17 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( 48 -128 -16 ) ( 47 -128 -16 ) ( 48 -128 -15 ) hltest [ 1 -6.123233995736766e-17 0 16 ] [ 0 0 -1 0 ] 0 1 1
+( -80 128 16 ) ( -80 129 16 ) ( -81 128 16 ) hltest [ 6.123233995736766e-17 1 0 0 ] [ 1 -6.123233995736766e-17 0 16 ] 90 1 1
+( -80 128 304 ) ( -81 128 304 ) ( -80 129 304 ) hltest [ 6.123233995736766e-17 1 0 0 ] [ 1 -6.123233995736766e-17 0 16 ] 270 1 1
+( -80 192 16 ) ( -80 192 17 ) ( -81 192 16 ) hltest [ -1 6.123233995736766e-17 0 -16 ] [ 0 0 -1 0 ] 0 1 1
+( -192 0 -16 ) ( -192 0 -15 ) ( -192 1 -16 ) hltest [ 6.123233995736766e-17 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
+}
+// brush 4
+{
+( 256 128 16 ) ( 256 129 16 ) ( 256 128 17 ) hltest [ -6.123233995736766e-17 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( 512 -128 -16 ) ( 511 -128 -16 ) ( 512 -128 -15 ) hltest [ 1 -6.123233995736766e-17 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( 384 128 16 ) ( 384 129 16 ) ( 383 128 16 ) hltest [ 6.123233995736766e-17 1 0 0 ] [ 1 -6.123233995736766e-17 0 0 ] 90 1 1
+( 384 128 304 ) ( 383 128 304 ) ( 384 129 304 ) hltest [ 6.123233995736766e-17 1 0 0 ] [ 1 -6.123233995736766e-17 0 0 ] 270 1 1
+( 384 192 16 ) ( 384 192 17 ) ( 383 192 16 ) hltest [ -1 6.123233995736766e-17 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( 272 0 -16 ) ( 272 0 -15 ) ( 272 1 -16 ) hltest [ 6.123233995736766e-17 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
+}
+// brush 5
+{
+( -192 -64 304 ) ( -192 -63 304 ) ( -192 -64 305 ) hltest [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( -64 -128 304 ) ( -64 -128 305 ) ( -63 -128 304 ) hltest [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( -64 -64 304 ) ( -63 -64 304 ) ( -64 -63 304 ) hltest [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
+( 64 64 336 ) ( 64 65 336 ) ( 65 64 336 ) hltest [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
+( 64 192 336 ) ( 65 192 336 ) ( 64 192 337 ) hltest [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( 256 64 336 ) ( 256 64 337 ) ( 256 65 336 ) hltest [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
+}
+}
+// entity 1
+{
+"classname" "info_player_start"
+"spawnflags" "0"
+"angles" "0 0 0"
+"origin" "32 16 52"
+}
+// entity 2
+{
+"classname" "light"
+"spawnflags" "0"
+"_light" "255 255 128 200"
+"style" "0"
+"_fade" "1.0"
+"_falloff" "0"
+"origin" "40 8 200"
+}
diff --git a/tests/test_qbsp.cc b/tests/test_qbsp.cc
index 74840fff..b4f7d2da 100644
--- a/tests/test_qbsp.cc
+++ b/tests/test_qbsp.cc
@@ -97,6 +97,10 @@ std::tuple<mbsp_t, bspxentries_t, std::optional<prtfile_t>> LoadTestmap(
         destdir = test_quake2_maps_dir;
     } else if (qbsp_options.target_game->id == GAME_QUAKE) {
         destdir = test_quake_maps_dir;
+    } else if (qbsp_options.target_game->id == GAME_HEXEN_II) {
+        destdir = test_hexen2_maps_dir;
+    } else if (qbsp_options.target_game->id == GAME_HALF_LIFE) {
+        destdir = test_halflife_maps_dir;
     }
 
     // copy .bsp to game's basedir/maps directory, for easy in-game testing
@@ -1901,3 +1905,19 @@ TEST_CASE("q1_missing_texture")
     CHECK("" == bsp.dtex.textures[1].name);
     CHECK(bsp.dtex.textures[1].null_texture);
 }
+
+TEST_CASE("hl_basic")
+{
+    const auto [bsp, bspx, prt] = LoadTestmap("hl_basic.map", {"-hlbsp"});
+    CHECK(prt);
+
+    REQUIRE(2 == bsp.dtex.textures.size());
+
+    // FIXME: we shouldn't really be writing skip
+    CHECK(bsp.dtex.textures[0].null_texture);
+
+    CHECK("hltest" == bsp.dtex.textures[1].name);
+    CHECK(!bsp.dtex.textures[1].null_texture);
+    CHECK(64 == bsp.dtex.textures[1].width);
+    CHECK(64 == bsp.dtex.textures[1].height);
+}