summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asset_defs.h3
-rw-r--r--include/objects.h6
2 files changed, 6 insertions, 3 deletions
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);