From 88eeee96f20bc748630d345759b46bba2126e1af Mon Sep 17 00:00:00 2001
From: Neil McGill <goblinhack@gmail.com>
Date: Sun, 28 Apr 2024 11:44:50 +0100
Subject: [PATCH] remove wall2

---
 src/gfx_32x32.cpp              | 112 ---------------------------------
 src/things/dungeon/tp_wall.cpp |   2 +-
 src/tp.cpp                     |   1 -
 3 files changed, 1 insertion(+), 114 deletions(-)

diff --git a/src/gfx_32x32.cpp b/src/gfx_32x32.cpp
index b7da924..5733b59 100644
--- a/src/gfx_32x32.cpp
+++ b/src/gfx_32x32.cpp
@@ -249,116 +249,4 @@ void gfx_init_32x32(void)
     };
     tile_load_arr("data/gfx/tiles_32x32_walls1.tga", "tiles_32x32_walls1", 32, 32, ARRAY_SIZE(tiles), tiles);
   }
-
-  {
-    const char *tiles[] = {
-        /* clang-format off */
-        // ##############################################################################
-        "wall2.IS_JOIN_TL2",
-        "wall2.IS_JOIN_T_3",
-        "wall2.IS_JOIN_TR2",
-        "wall2.IS_JOIN_TOP",
-        "wall2.IS_JOIN_X4_180",
-        "wall2.IS_JOIN_X4_270",
-        "wall2.IS_JOIN_X2_270",
-        "wall2.IS_JOIN_X2",
-        "wall2.IS_JOIN_X1_180",
-        "wall2.IS_JOIN_X1",
-        "wall2.IS_JOIN_X",
-        "",
-        // ##############################################################################
-        "wall2.IS_JOIN_T270_3",
-        "wall2.IS_JOIN_BLOCK",
-        "wall2.IS_JOIN_T90_3",
-        "wall2.IS_JOIN_VERT",
-        "wall2.IS_JOIN_X4_90",
-        "wall2.IS_JOIN_X4",
-        "wall2.IS_JOIN_X2_180",
-        "wall2.IS_JOIN_X2_90",
-        "wall2.IS_JOIN_X1_90",
-        "wall2.IS_JOIN_X1_270",
-        "wall2.IS_JOIN_X3_180",
-        "wall2.IS_JOIN_X3",
-        // ##############################################################################
-        "wall2.IS_JOIN_BL2",
-        "wall2.IS_JOIN_T180_3",
-        "wall2.IS_JOIN_BR2",
-        "wall2.IS_JOIN_BOT",
-        "wall2.IS_JOIN_T_1",
-        "wall2.IS_JOIN_T_2",
-        "wall2.IS_JOIN_T270_2",
-        "wall2.IS_JOIN_T90_1",
-        "wall2.IS_JOIN_T",
-        "wall2.IS_JOIN_T90",
-        "wall2.IS_JOIN_TL",
-        "wall2.IS_JOIN_TR",
-        // ##############################################################################
-        "wall2.IS_JOIN_LEFT",
-        "wall2.IS_JOIN_HORIZ",
-        "wall2.IS_JOIN_RIGHT",
-        "wall2.IS_JOIN_NODE",
-        "wall2.IS_JOIN_T180_2",
-        "wall2.IS_JOIN_T180_1",
-        "wall2.IS_JOIN_T270_1",
-        "wall2.IS_JOIN_T90_2",
-        "wall2.IS_JOIN_T270",
-        "wall2.IS_JOIN_T180",
-        "wall2.IS_JOIN_BL",
-        "wall2.IS_JOIN_BR",
-        // ##############################################################################
-        "wall2.IS_JOIN_TL2.shadow",
-        "wall2.IS_JOIN_T_3.shadow",
-        "wall2.IS_JOIN_TR2.shadow",
-        "wall2.IS_JOIN_TOP.shadow",
-        "wall2.IS_JOIN_X4_180.shadow",
-        "wall2.IS_JOIN_X4_270.shadow",
-        "wall2.IS_JOIN_X2_270.shadow",
-        "wall2.IS_JOIN_X2.shadow",
-        "wall2.IS_JOIN_X1_180.shadow",
-        "wall2.IS_JOIN_X1.shadow",
-        "wall2.IS_JOIN_X.shadow",
-        "",
-        // ##############################################################################
-        "wall2.IS_JOIN_T270_3.shadow",
-        "wall2.IS_JOIN_BLOCK.shadow",
-        "wall2.IS_JOIN_T90_3.shadow",
-        "wall2.IS_JOIN_VERT.shadow",
-        "wall2.IS_JOIN_X4_90.shadow",
-        "wall2.IS_JOIN_X4.shadow",
-        "wall2.IS_JOIN_X2_180.shadow",
-        "wall2.IS_JOIN_X2_90.shadow",
-        "wall2.IS_JOIN_X1_90.shadow",
-        "wall2.IS_JOIN_X1_270.shadow",
-        "wall2.IS_JOIN_X3_180.shadow",
-        "wall2.IS_JOIN_X3.shadow",
-        // ##############################################################################
-        "wall2.IS_JOIN_BL2.shadow",
-        "wall2.IS_JOIN_T180_3.shadow",
-        "wall2.IS_JOIN_BR2.shadow",
-        "wall2.IS_JOIN_BOT.shadow",
-        "wall2.IS_JOIN_T_1.shadow",
-        "wall2.IS_JOIN_T_2.shadow",
-        "wall2.IS_JOIN_T270_2.shadow",
-        "wall2.IS_JOIN_T90_1.shadow",
-        "wall2.IS_JOIN_T.shadow",
-        "wall2.IS_JOIN_T90.shadow",
-        "wall2.IS_JOIN_TL.shadow",
-        "wall2.IS_JOIN_TR.shadow",
-        // ##############################################################################
-        "wall2.IS_JOIN_LEFT.shadow",
-        "wall2.IS_JOIN_HORIZ.shadow",
-        "wall2.IS_JOIN_RIGHT.shadow",
-        "wall2.IS_JOIN_NODE.shadow",
-        "wall2.IS_JOIN_T180_2.shadow",
-        "wall2.IS_JOIN_T180_1.shadow",
-        "wall2.IS_JOIN_T270_1.shadow",
-        "wall2.IS_JOIN_T90_2.shadow",
-        "wall2.IS_JOIN_T270.shadow",
-        "wall2.IS_JOIN_T180.shadow",
-        "wall2.IS_JOIN_BL.shadow",
-        "wall2.IS_JOIN_BR.shadow",
-        /* clang-format on */
-    };
-    tile_load_arr("data/gfx/tiles_32x32_walls2.tga", "tiles_32x32_walls2", 32, 32, ARRAY_SIZE(tiles), tiles);
-  }
 }
diff --git a/src/things/dungeon/tp_wall.cpp b/src/things/dungeon/tp_wall.cpp
index 9981fa4..4b3332b 100644
--- a/src/things/dungeon/tp_wall.cpp
+++ b/src/things/dungeon/tp_wall.cpp
@@ -9,7 +9,7 @@
 
 bool tp_load_wall(void)
 {
-  for (auto variant = 1; variant <= 2; variant++) {
+  for (auto variant = 1; variant <= 1; variant++) {
     auto name = "wall" + std::to_string(variant);
     auto tp   = tp_load(name.c_str());
     // begin sort marker1 {
diff --git a/src/tp.cpp b/src/tp.cpp
index 70d3f7c..f17a57d 100644
--- a/src/tp.cpp
+++ b/src/tp.cpp
@@ -24,7 +24,6 @@ std::initializer_list< std::string > tps = {
     // clang-format off
     "", // ID 0 means unused
     "wall1",
-    "wall2",
     "player1",
     "player2",
     "player3",