diff --git a/data/gfx.tgz b/data/gfx.tgz index 447f0ed..94cac85 100644 Binary files a/data/gfx.tgz and b/data/gfx.tgz differ diff --git a/src/gfx.cpp b/src/gfx.cpp index 9240398..4c3d375 100644 --- a/src/gfx.cpp +++ b/src/gfx.cpp @@ -184,11 +184,9 @@ void gfx_init(void) gfx_init14(); gfx_init15(); gfx_init_12x12(); - gfx_init_16x16(); gfx_init2(); gfx_init_24x24(); gfx_init3(); - gfx_init_32x32(); gfx_init4(); gfx_init5(); gfx_init6(); diff --git a/src/gfx_12x12.cpp b/src/gfx_12x12.cpp index 39c35ac..0916181 100644 --- a/src/gfx_12x12.cpp +++ b/src/gfx_12x12.cpp @@ -17,6 +17,38 @@ void gfx_init_12x12(void) "floor.4", "floor.5", "floor.6", + "", + "", + "", + "", + "", + "", + // ############################################################################## + "player1.idle.0", + "player2.idle.0", + "player3.idle.0", + "player4.idle.0", + "", + "", + "", + "", + "", + "", + "", + "", + // ############################################################################## + "exit.0", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", // ############################################################################## /* clang-format on */ }; diff --git a/src/gfx_32x32.cpp b/src/gfx_32x32.cpp deleted file mode 100644 index 1ef8242..0000000 --- a/src/gfx_32x32.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// -// Copyright Neil McGill, goblinhack@gmail.com -// - -#include "my_tile.hpp" -#include "my_ui.hpp" - -void gfx_init_32x32(void) -{ - { - const char *tiles[] = { - /* clang-format off */ - // ############################################################################## - "exit.0", - "exit.1", - "exit.2", - "exit.3", - "exit.4", - "exit.5", - "exit.6", - "exit.7", - // ############################################################################## - /* clang-format on */ - }; - tile_load_arr("data/gfx/tiles_32x32.tga", "tiles_32x32", 32, 32, ARRAY_SIZE(tiles), tiles); - } -}