From a50de53da1dc128ffbcdacba28353fe0825c4ac9 Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Sat, 11 May 2024 16:13:07 +0200 Subject: new objects --- include/asset_defs.h | 4 ++++ include/objects.h | 6 ++++++ 2 files changed, 10 insertions(+) (limited to 'include') diff --git a/include/asset_defs.h b/include/asset_defs.h index fa04472..7681f2b 100644 --- a/include/asset_defs.h +++ b/include/asset_defs.h @@ -45,6 +45,10 @@ image* img_metal_wall2; image* img_chair_up; image* img_zombie_spawner; image* img_lamp_east; +image* img_metal_table_h; +image* img_cantine_glass; +image* img_glass_door_h_closed; +image* img_glass_door_h_open; // Throwables image* img_grenade; diff --git a/include/objects.h b/include/objects.h index 6369224..d1adf34 100644 --- a/include/objects.h +++ b/include/objects.h @@ -30,6 +30,9 @@ typedef enum t_object_type { OBJECT_SPACE_WINDOW_H = 7, OBJECT_ZOMBIE_SPAWNER = 8, // Substitute. OBJECT_LAMP_EAST = 9, + OBJECT_METAL_TABLE_H = 10, + OBJECT_CANTINE_GLASS = 11, + OBJECT_GLASS_DOOR_H, OBJECT_END, } object_type; @@ -74,6 +77,9 @@ object object_dict[OBJECT_END] = { {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_SPACE_WINDOW_H, 1}, {0,(vec3f){0, 0, 0},{1,1,0.5},OBJECT_ZOMBIE_SPAWNER, 1}, {0,(vec3f){0, 0, 0},{1,1,0},OBJECT_LAMP_EAST, 0}, + {0,(vec3f){0, 0, 0},{3,1,0.5},OBJECT_METAL_TABLE_H, 1}, + {0,(vec3f){0, 0, 0},{2,2,0.5},OBJECT_CANTINE_GLASS, 1}, + {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_GLASS_DOOR_H, 0}, }; object get_object_at_tile(float x, float y); -- cgit v1.2.3-70-g09d2