diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asset_defs.h | 2 | ||||
| -rw-r--r-- | include/map.h | 2 | ||||
| -rw-r--r-- | include/objects.h | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/include/asset_defs.h b/include/asset_defs.h index 3de8bbf..fc770cb 100644 --- a/include/asset_defs.h +++ b/include/asset_defs.h @@ -39,9 +39,11 @@ image* img_spawner; image* img_space_control_panel; image* img_space_control_panel2; image* img_space_window; +image* img_space_window_h; image* img_metal_wall; image* img_metal_wall2; image* img_chair_up; +image* img_zombie_spawner; // Throwables image* img_grenade; diff --git a/include/map.h b/include/map.h index 50e3941..3980c8a 100644 --- a/include/map.h +++ b/include/map.h @@ -33,7 +33,7 @@ typedef struct t_tile { #define MAP_SIZE_X 1000 #define MAP_SIZE_Y 1000 -#define MAX_LIGHT_EMITTERS 100 +#define MAX_LIGHT_EMITTERS 1000 typedef struct t_map_info { int tile_width; diff --git a/include/objects.h b/include/objects.h index f5b9255..da1459e 100644 --- a/include/objects.h +++ b/include/objects.h @@ -27,6 +27,8 @@ typedef enum t_object_type { OBJECT_METAL_WALL2 = 4, OBJECT_SPACE_CONTROL_PANEL2 = 5, OBJECT_CHAIR_UP = 6, + OBJECT_SPACE_WINDOW_H = 7, + OBJECT_ZOMBIE_SPAWNER = 8, // Substitute. OBJECT_END, } object_type; @@ -53,11 +55,13 @@ typedef struct t_box { // @NEWOBJECT object object_dict[OBJECT_END] = { {0,(vec3f){0, 0, 0},{1,3,0.5f},OBJECT_SPACE_CONTROL_PANEL}, - {0,(vec3f){0, 0, 0},{1,1,2},OBJECT_SPACE_WINDOW}, + {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_SPACE_WINDOW}, {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_METAL_WALL}, {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_METAL_WALL2}, {0,(vec3f){0, 0, 0},{3,1,0.5f},OBJECT_SPACE_CONTROL_PANEL2}, {0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CHAIR_UP}, + {0,(vec3f){0, 0, 0},{1,1,1},OBJECT_SPACE_WINDOW_H}, + {0,(vec3f){0, 0, 0},{1,1,0.5},OBJECT_ZOMBIE_SPAWNER}, }; object get_object_at_tile(float x, float y); |