From 428e59c69ec8f1e44bba5f917a3b4bfbdff86ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= <zaklaus@outlook.com>
Date: Wed, 3 Nov 2021 16:07:07 +0100
Subject: [PATCH] check for non-item asset

---
 code/game/src/assets_list.c      | 7 +++++--
 code/game/src/debug_ui_actions.c | 2 +-
 code/game/src/items.c            | 1 -
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/game/src/assets_list.c b/code/game/src/assets_list.c
index 2a053c5..e33446a 100644
--- a/code/game/src/assets_list.c
+++ b/code/game/src/assets_list.c
@@ -1,11 +1,14 @@
 #include "assets.h"
 
-#define ASSET_TEX(asset)\
+#define ASSET_ENTRY(asset, asset_kind)\
 {\
 .id = asset,\
-.kind = AKIND_TEXTURE,\
+.kind = asset_kind,\
 }
 
+#define ASSET_SND(asset) ASSET_ENTRY(asset, AKIND_SOUND)
+#define ASSET_TEX(asset) ASSET_ENTRY(asset, AKIND_TEXTURE)
+
 static asset assets[] = {
     ASSET_TEX(ASSET_EMPTY),
     ASSET_TEX(ASSET_DEMO_ICEMAKER),
diff --git a/code/game/src/debug_ui_actions.c b/code/game/src/debug_ui_actions.c
index a7bd552..5ca7af8 100644
--- a/code/game/src/debug_ui_actions.c
+++ b/code/game/src/debug_ui_actions.c
@@ -85,7 +85,7 @@ ActEraseWorldChanges(void) {
             
             if (l.is_outer && l.block_id > 0) {
                 asset_id item_asset = blocks_get_asset(l.block_id);
-                if (item_asset == ASSET_INVALID) continue;
+                if (item_find(item_asset) == ASSET_INVALID) continue;
                 uint64_t e = item_spawn(item_asset, 1);
                 
                 Position *dest = ecs_get_mut(world_ecs(), e, Position, NULL);
diff --git a/code/game/src/items.c b/code/game/src/items.c
index 9870864..1c44485 100644
--- a/code/game/src/items.c
+++ b/code/game/src/items.c
@@ -42,7 +42,6 @@ uint16_t item_find(asset_id kind) {
         if (items[i].kind == kind)
             return item_resolve_proxy(i);
     }
-    
     return ASSET_INVALID;
 }