diff options
| -rw-r--r-- | build/data/imgs/objects/metal_wall.png (renamed from build/data/imgs/objects/metal_wall_front.png) | bin | 2091 -> 2091 bytes | |||
| -rw-r--r-- | build/zombies.exe | bin | 2110612 -> 2110640 bytes | |||
| -rw-r--r-- | data/imgs/objects/metal_wall.png (renamed from data/imgs/objects/metal_wall_front.png) | bin | 2091 -> 2091 bytes | |||
| -rw-r--r-- | include/asset_defs.h | 3 | ||||
| -rw-r--r-- | include/objects.h | 6 | ||||
| -rw-r--r-- | src/asset_defs.c | 3 | ||||
| -rw-r--r-- | src/map.c | 2 | ||||
| -rw-r--r-- | src/objects.c | 6 |
8 files changed, 13 insertions, 7 deletions
diff --git a/build/data/imgs/objects/metal_wall_front.png b/build/data/imgs/objects/metal_wall.png Binary files differindex 569355a..569355a 100644 --- a/build/data/imgs/objects/metal_wall_front.png +++ b/build/data/imgs/objects/metal_wall.png diff --git a/build/zombies.exe b/build/zombies.exe Binary files differindex 0e50984..a3254e3 100644 --- a/build/zombies.exe +++ b/build/zombies.exe diff --git a/data/imgs/objects/metal_wall_front.png b/data/imgs/objects/metal_wall.png Binary files differindex 569355a..569355a 100644 --- a/data/imgs/objects/metal_wall_front.png +++ b/data/imgs/objects/metal_wall.png diff --git a/include/asset_defs.h b/include/asset_defs.h index 6202125..d75a3ee 100644 --- a/include/asset_defs.h +++ b/include/asset_defs.h @@ -33,7 +33,8 @@ image* img_icon_molotov; image* img_spawner; image* img_obj_plants; image* img_obj_wall1; -image* img_metal_wall_front; +image* img_metal_wall; +image* img_metal_wall2; // Throwables image* img_grenade; diff --git a/include/objects.h b/include/objects.h index 2d91bab..62396fa 100644 --- a/include/objects.h +++ b/include/objects.h @@ -22,7 +22,8 @@ typedef enum t_object_type { OBJECT_NONE, OBJECT_COBBLESTONEWALL1, OBJECT_PLANTBOX1, - OBJECT_METAL_WALL_FRONT, + OBJECT_METAL_WALL, + OBJECT_METAL_WALL2, OBJECT_END, } object_type; @@ -49,7 +50,8 @@ typedef struct t_box { object object_dict[OBJECT_END] = { {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_COBBLESTONEWALL1}, {0,(vec3f){0, 0, 0},{1,1,2},OBJECT_PLANTBOX1}, - {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_METAL_WALL_FRONT}, + {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_METAL_WALL}, + {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_METAL_WALL2}, }; object get_object_at_tile(float x, float y); diff --git a/src/asset_defs.c b/src/asset_defs.c index 35c6f0c..34c3758 100644 --- a/src/asset_defs.c +++ b/src/asset_defs.c @@ -41,7 +41,8 @@ void load_assets() { img_spawner = assets_load_image_from_file("data/imgs/spawner.png"); img_obj_plants = assets_load_image_from_file("data/imgs/plants.png"); img_obj_wall1 = assets_load_image_from_file("data/imgs/wall1.png"); - img_metal_wall_front = assets_load_image_from_file("data/imgs/objects/metal_wall_front.png"); + img_metal_wall = assets_load_image_from_file("data/imgs/objects/metal_wall.png"); + img_metal_wall2 = assets_load_image_from_file("data/imgs/objects/metal_wall2.png"); // Players img_helmet = assets_load_image_from_file("data/imgs/players/helmet.png"); @@ -224,7 +224,7 @@ void create_empty_map() { } for (int x = 0; x < MAP_SIZE_X; x++) { - map_to_load.objects[x] = (object){.active = true, .position = (vec3f){x, 0, 0}, .size = (vec3f){1,1,1}, .type = OBJECT_METAL_WALL_FRONT}; + map_to_load.objects[x] = (object){.active = true, .position = (vec3f){x, 0, 0}, .size = (vec3f){1,1,1}, .type = OBJECT_METAL_WALL}; } map_to_load.light_emitters[0] = (light_emitter){.brightness = 1.0f, .position = (vec3f){0, 0, 10}, .range = 20.0f, .active = true}; diff --git a/src/objects.c b/src/objects.c index 32a2dc7..fc181c6 100644 --- a/src/objects.c +++ b/src/objects.c @@ -80,8 +80,10 @@ image* get_image_from_objecttype(object_type tile) { return img_obj_wall1; case OBJECT_PLANTBOX1: return img_obj_plants; - case OBJECT_METAL_WALL_FRONT: - return img_metal_wall_front; + case OBJECT_METAL_WALL: + return img_metal_wall; + case OBJECT_METAL_WALL2: + return img_metal_wall2; default: return 0; } |
