summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asset_defs.h13
-rw-r--r--include/map.h2
-rw-r--r--include/objects.h22
3 files changed, 37 insertions, 0 deletions
diff --git a/include/asset_defs.h b/include/asset_defs.h
index 3c09f44..5b26329 100644
--- a/include/asset_defs.h
+++ b/include/asset_defs.h
@@ -87,6 +87,17 @@ image* img_club_wall2;
image* img_club_wall3;
image* img_bowling_lane;
image* img_bowling_lane_end;
+image* img_bowling_machine;
+image* img_painting1;
+image* img_painting2;
+image* img_painting3;
+image* img_painting4;
+image* img_painting5;
+image* img_painting6;
+image* img_painting7;
+image* img_painting8;
+image* img_painting9;
+image* img_painting10;
// Throwables
image* img_grenade;
@@ -159,6 +170,8 @@ image* img_tile_club_stairs10;
image* img_tile_club_stairs11;
image* img_tile_club_stairs12;
image* img_tile_club_stairs13;
+image* img_tile_laminate;
+image* img_tile_concrete;
// Sounds
Mix_Chunk* wav_throwable_bounce;
diff --git a/include/map.h b/include/map.h
index da70c39..517f758 100644
--- a/include/map.h
+++ b/include/map.h
@@ -39,6 +39,8 @@ typedef enum t_tile_type {
TILE_CLUB_STAIRS11 = 28,
TILE_CLUB_STAIRS12 = 29,
TILE_CLUB_STAIRS13 = 30,
+ TILE_CONCRETE = 31,
+ TILE_LAMINATE = 32,
TILE_END,
} tile_type;
diff --git a/include/objects.h b/include/objects.h
index 4850a90..9d22942 100644
--- a/include/objects.h
+++ b/include/objects.h
@@ -58,6 +58,17 @@ typedef enum t_object_type {
OBJECT_BOWLING_LANE = 34,
OBJECT_BOWLING_LANE_END = 35,
OBJECT_GLASS_DOOR_V = 36, // Substitute.
+ OBJECT_BOWLING_MACHINE = 37,
+ OBJECT_PAINTING1 = 38,
+ OBJECT_PAINTING2 = 39,
+ OBJECT_PAINTING3 = 40,
+ OBJECT_PAINTING4 = 41,
+ OBJECT_PAINTING5 = 42,
+ OBJECT_PAINTING6 = 43,
+ OBJECT_PAINTING7 = 44,
+ OBJECT_PAINTING8 = 45,
+ OBJECT_PAINTING9 = 46,
+ OBJECT_PAINTING10 = 47,
OBJECT_END,
} object_type;
@@ -129,6 +140,17 @@ object object_dict[OBJECT_END] = {
{0,(vec3f){0, 0, 0},{13,3,0},OBJECT_BOWLING_LANE, 0},
{0,(vec3f){0, 0, 0},{2,3,1},OBJECT_BOWLING_LANE_END, 1},
{0,(vec3f){0, 0, 0},{1,2,1},OBJECT_GLASS_DOOR_V, 0},
+ {0,(vec3f){0, 0, 0},{3,1,0.5f},OBJECT_BOWLING_MACHINE, 1},
+ {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING1, 0},
+ {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING2, 0},
+ {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING3, 0},
+ {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING4, 0},
+ {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING5, 0},
+ {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING6, 0},
+ {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING7, 0},
+ {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING8, 0},
+ {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING9, 0},
+ {0,(vec3f){0, 0, 0},{2,1,1},OBJECT_PAINTING10, 0},
};
// decoration objects laying on floor.