diff options
| author | Aldrik Ramaekers <aldrikboy@gmail.com> | 2024-05-11 12:27:41 +0200 |
|---|---|---|
| committer | Aldrik Ramaekers <aldrikboy@gmail.com> | 2024-05-11 12:27:41 +0200 |
| commit | 0ed1a617a897cf241406b3b7d5ddda5b74f4d9f4 (patch) | |
| tree | 74e5537902360e8bc2ea0e165eeb44f3ee479c5c /include | |
| parent | 981d99c229161c8afa508468032fe3ea0b924d3b (diff) | |
backdrop, floors, chairs
Diffstat (limited to 'include')
| -rw-r--r-- | include/asset_defs.h | 7 | ||||
| -rw-r--r-- | include/map.h | 8 | ||||
| -rw-r--r-- | include/objects.h | 5 | ||||
| -rw-r--r-- | include/wall_item.h | 2 |
4 files changed, 15 insertions, 7 deletions
diff --git a/include/asset_defs.h b/include/asset_defs.h index 97cea1c..3de8bbf 100644 --- a/include/asset_defs.h +++ b/include/asset_defs.h @@ -37,9 +37,11 @@ image* img_icon_molotov; // Objects // @NEWOBJECT image* img_spawner; image* img_space_control_panel; +image* img_space_control_panel2; image* img_space_window; image* img_metal_wall; image* img_metal_wall2; +image* img_chair_up; // Throwables image* img_grenade; @@ -80,8 +82,9 @@ image* img_zombie_chunk_foot; image* img_zombie_chunk_blood; // Tiles -image* img_tile_cobblestone; -image* img_tile_grass1; +image* img_mars_surface; +image* img_tile_floor1; +image* img_tile_floor2; // Sounds Mix_Chunk* wav_throwable_bounce; diff --git a/include/map.h b/include/map.h index 8b11634..50e3941 100644 --- a/include/map.h +++ b/include/map.h @@ -8,8 +8,8 @@ typedef enum t_tile_type { TILE_NONE = 0, - TILE_COBBLESTONE1 = 1, - TILE_GRASS1 = 2, + TILE_FLOOR1 = 1, + TILE_FLOOR2 = 2, TILE_END, } tile_type; @@ -42,7 +42,7 @@ typedef struct t_map_info { float px_incline; } map_info; -typedef struct t_map_data { +typedef struct t_map_data { // Data written to disk. int width; int height; int heightmap[MAP_SIZE_Y][MAP_SIZE_X]; @@ -58,7 +58,7 @@ typedef struct t_light_data { float br; } light_data; -typedef struct t_extracted_map_data { +typedef struct t_extracted_map_data { // Data extracted from file on disk. int width; int height; tile heightmap[MAP_SIZE_Y][MAP_SIZE_X]; // tilemap diff --git a/include/objects.h b/include/objects.h index ef53d78..f5b9255 100644 --- a/include/objects.h +++ b/include/objects.h @@ -18,12 +18,15 @@ typedef struct t_light_emitter { float range; } light_emitter; +// @NEWOBJECT typedef enum t_object_type { OBJECT_NONE, OBJECT_SPACE_CONTROL_PANEL = 1, OBJECT_SPACE_WINDOW = 2, OBJECT_METAL_WALL = 3, OBJECT_METAL_WALL2 = 4, + OBJECT_SPACE_CONTROL_PANEL2 = 5, + OBJECT_CHAIR_UP = 6, OBJECT_END, } object_type; @@ -53,6 +56,8 @@ object object_dict[OBJECT_END] = { {0,(vec3f){0, 0, 0},{1,1,2},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}, }; object get_object_at_tile(float x, float y); diff --git a/include/wall_item.h b/include/wall_item.h index 4d437e0..231788e 100644 --- a/include/wall_item.h +++ b/include/wall_item.h @@ -24,7 +24,7 @@ typedef struct t_wall_item { image* img; } wall_item; -#define MAX_WALLITEMS (20) +#define MAX_WALLITEMS (200) wall_item wallitems[MAX_WALLITEMS] = {0}; void update_wallitems_server(); |