diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asset_defs.h | 7 | ||||
| -rw-r--r-- | include/map.h | 5 | ||||
| -rw-r--r-- | include/objects.h | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/include/asset_defs.h b/include/asset_defs.h index 0e7e5b4..5a239ae 100644 --- a/include/asset_defs.h +++ b/include/asset_defs.h @@ -54,6 +54,9 @@ image* img_big_control_panel; image* img_chair_down; image* img_computer_rack; image* img_generator; +image* img_school_table; +image* img_school_bench; +image* img_locker; // Throwables image* img_grenade; @@ -98,6 +101,10 @@ image* img_mars_surface; image* img_space_parallax; image* img_tile_floor1; image* img_tile_floor2; +image* img_tile_bathroom; +image* img_tile_funk; +image* img_tile_wood1; +image* img_tile_gym; // Sounds Mix_Chunk* wav_throwable_bounce; diff --git a/include/map.h b/include/map.h index 8b57d84..960e9e6 100644 --- a/include/map.h +++ b/include/map.h @@ -6,10 +6,15 @@ #include "players.h" #include "objects.h" +// @NEWTILE typedef enum t_tile_type { TILE_NONE = 0, TILE_FLOOR1 = 1, TILE_FLOOR2 = 2, + TILE_BATHROOM = 3, + TILE_FUNK = 4, + TILE_WOOD1 = 5, + TILE_GYM = 6, TILE_END, } tile_type; diff --git a/include/objects.h b/include/objects.h index dd9760b..a98f7a7 100644 --- a/include/objects.h +++ b/include/objects.h @@ -38,6 +38,9 @@ typedef enum t_object_type { OBJECT_CHAIR_DOWN = 15, OBJECT_COMPUTER_RACK = 16, OBJECT_GENERATOR = 17, + OBJECT_SCHOOL_TABLE = 18, + OBJECT_SCHOOL_BENCH = 19, + OBJECT_LOCKER = 20, OBJECT_END, } object_type; @@ -90,6 +93,9 @@ object object_dict[OBJECT_END] = { {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}, {0,(vec3f){0, 0, 0},{8,2,1.0f},OBJECT_GENERATOR, 1}, + {0,(vec3f){0, 0, 0},{1,4,0.5f},OBJECT_SCHOOL_TABLE, 1}, + {0,(vec3f){0, 0, 0},{2,1,0.5f},OBJECT_SCHOOL_BENCH, 1}, + {0,(vec3f){0, 0, 0},{1,1,1.0f},OBJECT_LOCKER, 1}, }; object get_object_at_tile(float x, float y); |