diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/asset_defs.c | 3 | ||||
| -rw-r--r-- | src/map.c | 2 | ||||
| -rw-r--r-- | src/objects.c | 6 |
3 files changed, 7 insertions, 4 deletions
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; } |