Fixing things up for future thingies

4 files changed, 4 insertions, 33 deletions

diff --git a/assets/heightmap.png b/assets/heightmap.png
deleted file mode 100644
index b9a1b69..0000000
--- a/assets/heightmap.png
+++ /dev/null
diff --git a/src/assets.c b/src/assets.c
index a50b824..604b622 100644
--- a/src/assets.c
+++ b/src/assets.c
@@ -1,11 +1,6 @@
 #include "assets.h"
 
-const char imageAssetPaths[IMAGE_ASSET_COUNT][FT_NAMEMAX] = {
-  "heightmap.png"
-};
-
 const char textureAssetPaths[TEXTURE_ASSET_COUNT][FT_NAMEMAX] = {
-  "heightmap.png",
   "mint.png",
   "nickel.png",
   "tree.png"
@@ -13,14 +8,6 @@ const char textureAssetPaths[TEXTURE_ASSET_COUNT][FT_NAMEMAX] = {
 
 void initAssets(Assets* assets)
 {
-  // Images.
-  for (int index = 0; index < IMAGE_ASSET_COUNT; ++index)
-  {
-    assets->images[index] = LoadImage(
-      TextFormat("assets/%s", imageAssetPaths[index]));
-  }
-
-  // Textures.
   for (int index = 0; index < TEXTURE_ASSET_COUNT; ++index)
   {
     assets->textures[index] = LoadTexture(
@@ -30,14 +17,7 @@ void initAssets(Assets* assets)
 
 void closeAssets(Assets* assets)
 {
-  // Images.
-  for (int index = 0; index < IMAGE_ASSET_COUNT; ++index)
-  {
-    UnloadImage(assets->images[index]);
-  }
-
-  // Textures.
-  for (int index = 0; index < TEXTURE_ASSET_COUNT; ++index)
+   for (int index = 0; index < TEXTURE_ASSET_COUNT; ++index)
   {
     UnloadTexture(assets->textures[index]);
   }
diff --git a/src/assets.h b/src/assets.h
index 0c6664c..88345b1 100644
--- a/src/assets.h
+++ b/src/assets.h
@@ -3,29 +3,20 @@
 #ifndef ASSETS_H
 #define ASSETS_H
 
-#define IMAGE_ASSET_COUNT 1
-#define TEXTURE_ASSET_COUNT 4
+#define TEXTURE_ASSET_COUNT 3
 
-extern const char imageAssetPaths[IMAGE_ASSET_COUNT][FT_NAMEMAX];
 extern const char textureAssetPaths[TEXTURE_ASSET_COUNT][FT_NAMEMAX];
 
 typedef int8_t AssetId;
 
-// Image asset ids.
-enum {
-  HEIGHT_MAP_IMAGE
-};
-
 // Texture asset ids.
 enum {
-  HEIGHT_MAP_TEXTURE,
   MINT_TEXTURE,
-  NICK_TEXTURE,
+  NICKEL_TEXTURE,
   TREE_TEXTURE
 };
 
 typedef struct {
-  Image images[IMAGE_ASSET_COUNT];
   Texture textures[TEXTURE_ASSET_COUNT];
 } Assets;
 
diff --git a/src/entity.c b/src/entity.c
index e510a01..d5a0bab 100644
--- a/src/entity.c
+++ b/src/entity.c
@@ -26,7 +26,7 @@ void updateEntity(Entity* entity, Game* game)
                   entity->position, 1.0, WHITE);
     break;
   case STICKY_NICKEL:
-    DrawBillboard(game->player.camera, game->assets.textures[NICK_TEXTURE],
+    DrawBillboard(game->player.camera, game->assets.textures[NICKEL_TEXTURE],
                   entity->position, 1.0, WHITE);
     break;
   default: