redesigning

goblinhack · Jan 21, 2024 · da25920 · da25920
1 parent 0ece706
commit da25920
Show file tree

Hide file tree

Showing 56 changed files with 661 additions and 876 deletions.
diff --git a/data/gfx.tgz b/data/gfx.tgz
diff --git a/src/game_init.cpp b/src/game_init.cpp
@@ -26,7 +26,7 @@ void Game::init(void)
 
     level_ph2_norm_init();
     level_ph2_entrances();
-    level_ph2_exit_init();
+    level_ph2_dungeon_exit_init();
     level_ph2_secr_init();
     level_ph2_lock_init();
     level_ph2_key_init();

diff --git a/src/gfx.cpp b/src/gfx.cpp
@@ -181,8 +181,7 @@ void gfx_init(void)
   gfx_init14();
   gfx_init15();
   gfx_init_16x16();
-  gfx_init_rocks();
-  gfx_init_walls();
+  gfx_init_world();
   gfx_init_24x24();
   gfx_init_32x32();
 }

diff --git a/src/gfx_16x16.cpp b/src/gfx_16x16.cpp
@@ -9,17 +9,7 @@ void gfx_init_16x16(void)
 {
   std::initializer_list< std::string > tiles = {
       // clang-format off
-      "ladder.0",      "block.0",       "rock_gold.0",   "spike.0",      "snake.0",      "snake.1",      "snake.2",    "snake.3",      "", "",
-      "ladder.1",      "block.1",       "rock_gold.1",   "spike.1",      "",             "",             "",           "",             "", "",
-      "ladder.2",      "block.2",       "rock_gold.2",   "spike.2",      "",             "",             "",           "",             "", "",
-      "ladder.3",      "block.3",       "rock_gold.3",   "spike.3",      "",             "",             "",           "",             "", "",
-      "ladder.4",      "block.4",       "rock_gold.4",   "spike.4",      "",             "",             "",           "",             "", "",
-      "key0",          "",              "",              "",             "",             "",             "",           "",             "", "",
-      "crystal0",      "crystal1",      "crystal2",      "crystal3",     "crystal4",     "crystal5",     "crystal6",   "",             "", "",
-      "player.idle.0", "player.idle.1", "",              "",             "",             "",             "",           "",             "", "",
-      "player.up.0",   "player.up.1",   "",              "",             "",             "",             "",           "",             "", "",
-      "player.walk.0", "player.walk.1", "",              "",             "",             "",             "",           "",             "", "",
-      "player.run.0",  "player.run.1",  "player.run.2",  "player.run.3", "player.run.4", "player.run.5", "",           "",             "", "",
+      "",              "",              "",              "",             "",             "",             "",           "",
       // clang-format on
   };
   const std::vector< std::string > arr(tiles);

diff --git a/src/gfx_32x32.cpp b/src/gfx_32x32.cpp
@@ -9,8 +9,23 @@ void gfx_init_32x32(void)
 {
   std::initializer_list< std::string > tiles = {
       // clang-format off
-      "entrance", "",       "",       "",       "",       "",       "",       "",
-      "exit.0",   "exit.1", "exit.2", "exit.3", "exit.4", "exit.5", "exit.6", "exit.7",
+      "dungeon_entrance",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      "",
+      // ##############################################################################
+      "dungeon_exit.0",
+      "dungeon_exit.1",
+      "dungeon_exit.2",
+      "dungeon_exit.3",
+      "dungeon_exit.4",
+      "dungeon_exit.5",
+      "dungeon_exit.6",
+      "dungeon_exit.7",
       // clang-format on
   };
   const std::vector< std::string > arr(tiles);

diff --git a/src/gfx_rock.cpp b/src/gfx_rock.cpp
diff --git a/src/gfx_walls.cpp b/src/gfx_walls.cpp
diff --git a/src/gfx_world.cpp b/src/gfx_world.cpp
@@ -0,0 +1,36 @@
+//
+// Copyright Neil McGill, [email protected]
+//
+
+#include "my_tile.hpp"
+#include "my_ui.hpp"
+
+void gfx_init_world(void)
+{
+  std::initializer_list< std::string > tiles = {
+      // clang-format off
+      "world_mountains.tl.0",   "world_mountains.top.0", "world_mountains.tr.0",
+      "world_mountains.tl.1",   "world_mountains.top.1", "world_mountains.tr.1",
+      "world_mountains.tl.2",   "world_mountains.top.2", "world_mountains.tr.2",
+      "world_mountains.tl.3",   "world_mountains.top.3", "world_mountains.tr.3",
+      "world_mountains.tl.4",   "world_mountains.top.4", "world_mountains.tr.4",
+      "world_mountains.tl.5",   "world_mountains.top.5", "world_mountains.tr.5",
+      // ###############################################################################
+      "world_mountains.left.0", "world_mountains.0",     "world_mountains.right.0",
+      "world_mountains.left.1", "world_mountains.1",     "world_mountains.right.1",
+      "world_mountains.left.2", "world_mountains.2",     "world_mountains.right.2",
+      "world_mountains.left.3", "world_mountains.3",     "world_mountains.right.3",
+      "world_mountains.left.4", "world_mountains.4",     "world_mountains.right.4",
+      "world_mountains.left.5", "world_mountains.5",     "world_mountains.right.5",
+      // ###############################################################################
+      "world_mountains.bl.0",   "world_mountains.bot.0", "world_mountains.br.0",
+      "world_mountains.bl.1",   "world_mountains.bot.1", "world_mountains.br.1",
+      "world_mountains.bl.2",   "world_mountains.bot.2", "world_mountains.br.2",
+      "world_mountains.bl.3",   "world_mountains.bot.3", "world_mountains.br.3",
+      "world_mountains.bl.4",   "world_mountains.bot.4", "world_mountains.br.4",
+      "world_mountains.bl.5",   "world_mountains.bot.5", "world_mountains.br.5",
+      // clang-format on
+  };
+  const std::vector< std::string > arr(tiles);
+  tile_load_arr_sprites("data/gfx/world.tga", "world", 16, 16, arr);
+}
diff --git a/src/level_anim.cpp b/src/level_anim.cpp
@@ -6,7 +6,7 @@
 #include "my_level.hpp"
 #include "my_level_data.hpp"
 #include "my_main.hpp"
-#include "my_thing_template.hpp"
+#include "my_tp.hpp"
 
 void Level::anim(void)
 {