Skip to content

Commit

Permalink
remove wall2
Browse files Browse the repository at this point in the history
  • Loading branch information
@goblinhack
goblinhack committed Apr 28, 2024
1 parent 139fc00 commit 88eeee9
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 114 deletions.
112 changes: 0 additions & 112 deletions src/gfx_32x32.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion src/things/dungeon/tp_wall.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion src/tp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ std::initializer_list< std::string > tps = {
// clang-format off
"", // ID 0 means unused
"wall1",
"wall2",
"player1",
"player2",
"player3",
Expand Down

0 comments on commit 88eeee9

Please sign in to comment.