diff options
| author | Aldrik Ramaekers <aldrikboy@gmail.com> | 2024-05-12 11:43:57 +0200 |
|---|---|---|
| committer | Aldrik Ramaekers <aldrikboy@gmail.com> | 2024-05-12 11:43:57 +0200 |
| commit | f73e3661b136d4da4d66ef15b264ec7a958be335 (patch) | |
| tree | 0fe84a543fee9622cfaa1dfd29714347c2496111 /include | |
| parent | 2e04356bbb1d16c0d519156c3bcf201aea291e09 (diff) | |
new objects
Diffstat (limited to 'include')
| -rw-r--r-- | include/asset_defs.h | 4 | ||||
| -rw-r--r-- | include/objects.h | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/asset_defs.h b/include/asset_defs.h index 6102be6..d691e61 100644 --- a/include/asset_defs.h +++ b/include/asset_defs.h @@ -45,10 +45,14 @@ image* img_metal_wall2; image* img_chair_up; image* img_zombie_spawner; image* img_lamp_east; +image* img_lamp_south; image* img_metal_table_h; image* img_cantine_glass; image* img_glass_door_h_closed; image* img_glass_door_h_open; +image* img_big_control_panel; +image* img_chair_down; +image* img_computer_rack; // Throwables image* img_grenade; diff --git a/include/objects.h b/include/objects.h index d1adf34..6cfbf43 100644 --- a/include/objects.h +++ b/include/objects.h @@ -32,7 +32,11 @@ typedef enum t_object_type { OBJECT_LAMP_EAST = 9, OBJECT_METAL_TABLE_H = 10, OBJECT_CANTINE_GLASS = 11, - OBJECT_GLASS_DOOR_H, + OBJECT_GLASS_DOOR_H = 12, // Substitute. + OBJECT_LAMP_SOUTH = 13, + OBJECT_BIG_CONTROL_PANEL = 14, + OBJECT_CHAIR_DOWN = 15, + OBJECT_COMPUTER_RACK = 16, OBJECT_END, } object_type; @@ -80,6 +84,10 @@ object object_dict[OBJECT_END] = { {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}, + {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_LAMP_SOUTH, 0}, + {0,(vec3f){0, 0, 0},{3,7,0.5f},OBJECT_BIG_CONTROL_PANEL, 1}, + {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CHAIR_DOWN, 1}, + {0,(vec3f){0, 0, 0},{2,1,1.0f},OBJECT_COMPUTER_RACK, 1}, }; object get_object_at_tile(float x, float y); |