diff --git a/art/gen/iron_ingot.png b/art/gen/iron_ingot.png new file mode 100644 index 0000000..ef3e3dc Binary files /dev/null and b/art/gen/iron_ingot.png differ diff --git a/art/gen/iron_plate.png b/art/gen/iron_plate.png index 3866e56..22e9ce9 100644 Binary files a/art/gen/iron_plate.png and b/art/gen/iron_plate.png differ diff --git a/art/gen/log.png b/art/gen/log.png index 68e9d6f..8edd1e5 100644 Binary files a/art/gen/log.png and b/art/gen/log.png differ diff --git a/art/gen/plank.png b/art/gen/plank.png index cc1cc20..c4582e8 100644 Binary files a/art/gen/plank.png and b/art/gen/plank.png differ diff --git a/art/gen/screws.png b/art/gen/screws.png index 57ae153..11e84ad 100644 Binary files a/art/gen/screws.png and b/art/gen/screws.png differ diff --git a/art/raw/iron_ingot.aseprite b/art/raw/iron_ingot.aseprite new file mode 100644 index 0000000..16135b1 Binary files /dev/null and b/art/raw/iron_ingot.aseprite differ diff --git a/art/raw/iron_plate.aseprite b/art/raw/iron_plate.aseprite index bfefd98..ae0bf82 100644 Binary files a/art/raw/iron_plate.aseprite and b/art/raw/iron_plate.aseprite differ diff --git a/art/raw/log.aseprite b/art/raw/log.aseprite index 30aa716..3a571c8 100644 Binary files a/art/raw/log.aseprite and b/art/raw/log.aseprite differ diff --git a/art/raw/plank.aseprite b/art/raw/plank.aseprite index e3d39f2..e4f6239 100644 Binary files a/art/raw/plank.aseprite and b/art/raw/plank.aseprite differ diff --git a/art/raw/screws.aseprite b/art/raw/screws.aseprite index 4f0d876..e314f6b 100644 Binary files a/art/raw/screws.aseprite and b/art/raw/screws.aseprite differ diff --git a/code/foundation/src/gen/texgen_fallback.c b/code/foundation/src/gen/texgen_fallback.c index 89fb983..6c5f7e4 100644 --- a/code/foundation/src/gen/texgen_fallback.c +++ b/code/foundation/src/gen/texgen_fallback.c @@ -23,7 +23,7 @@ Texture2D texgen_build_sprite_fallback(asset_id id) { // NOTE(zaklaus): items case ASSET_COAL: return LoadTexEco("coal"); case ASSET_IRON_ORE: return LoadTexEco("iron_ore"); - //case ASSET_IRON_INGOT: return LoadTexEco("iron_ingot"); + case ASSET_IRON_INGOT: return LoadTexEco("iron_ingot"); case ASSET_IRON_PLATES: return LoadTexEco("iron_plate"); case ASSET_SCREWS: return LoadTexEco("screws"); case ASSET_LOG: return LoadTexEco("log"); diff --git a/code/foundation/src/models/crafting.c b/code/foundation/src/models/crafting.c index dd32ce6..b25ff48 100644 --- a/code/foundation/src/models/crafting.c +++ b/code/foundation/src/models/crafting.c @@ -17,7 +17,7 @@ typedef struct { uint32_t craft__find_num_recipes_by_reagent(asset_id producer, asset_id id) { uint32_t num_recipes=0; - for (int i = 0; i < MAX_RECIPES; ++i) { + for (int i = 0; i < (int)MAX_RECIPES; ++i) { if (recipes[i].producer == producer) { for (int j = 0; recipes[i].reagents[j].id; ++j) { if (recipes[i].reagents[j].id == id) { @@ -30,7 +30,7 @@ uint32_t craft__find_num_recipes_by_reagent(asset_id producer, asset_id id) { } recipe *craft__find_recipe_by_reagent(asset_id producer, asset_id id, uint32_t slot_id) { - for (int i = 0; i < MAX_RECIPES; ++i) { + for (int i = 0; i < (int)MAX_RECIPES; ++i) { if (recipes[i].producer == producer) { for (int j = 0; recipes[i].reagents[j].id; ++j) { if (recipes[i].reagents[j].id == id) {