From e2fb2bc2072f7d404a1c1664836d25b84b6fad03 Mon Sep 17 00:00:00 2001
From: Aldrik Ramaekers <aldrikboy@gmail.com>
Date: Wed, 15 May 2024 22:08:10 +0200
Subject: club and bowling assets

---
 include/asset_defs.h | 30 ++++++++++++++++++++++++++++++
 include/map.h        | 18 ++++++++++++++++++
 include/objects.h    | 24 ++++++++++++++++++++++++
 3 files changed, 72 insertions(+)

(limited to 'include')

diff --git a/include/asset_defs.h b/include/asset_defs.h
index 8be4c66..ca2f383 100644
--- a/include/asset_defs.h
+++ b/include/asset_defs.h
@@ -73,6 +73,18 @@ image* img_locker;
 image* img_bar_h;
 image* img_bar_v;
 image* img_bar_hv;
+image* img_club_seat1;
+image* img_club_seat2;
+image* img_club_seat3;
+image* img_club_seat4;
+image* img_club_seat5;
+image* img_club_seat6;
+image* img_club_seat7;
+image* img_club_wall1;
+image* img_club_wall2;
+image* img_club_wall3;
+image* img_bowling_lane;
+image* img_bowling_lane_end;
 
 // Throwables
 image* img_grenade;
@@ -127,6 +139,24 @@ image* img_tile_carpet2;
 image* img_tile_carpet3;
 image* img_tile_carpet4;
 image* img_tile_carpet5;
+image* img_tile_carpet_stairs_v;
+image* img_tile_club1;
+image* img_tile_club2;
+image* img_tile_club3;
+image* img_tile_club4;
+image* img_tile_club_stairs1;
+image* img_tile_club_stairs2;
+image* img_tile_club_stairs3;
+image* img_tile_club_stairs4;
+image* img_tile_club_stairs5;
+image* img_tile_club_stairs6;
+image* img_tile_club_stairs7;
+image* img_tile_club_stairs8;
+image* img_tile_club_stairs9;
+image* img_tile_club_stairs10;
+image* img_tile_club_stairs11;
+image* img_tile_club_stairs12;
+image* img_tile_club_stairs13;
 
 // Sounds
 Mix_Chunk* wav_throwable_bounce;
diff --git a/include/map.h b/include/map.h
index b3c1512..da70c39 100644
--- a/include/map.h
+++ b/include/map.h
@@ -21,6 +21,24 @@ typedef enum t_tile_type {
 	TILE_CARPET3 = 10,
 	TILE_CARPET4 = 11,
 	TILE_CARPET5 = 12,
+	TILE_CARPET_STAIRS_v = 13,
+	TILE_CLUB1 = 14,
+	TILE_CLUB2 = 15,
+	TILE_CLUB3 = 16,
+	TILE_CLUB4 = 17,
+	TILE_CLUB_STAIRS1 = 18,
+	TILE_CLUB_STAIRS2 = 19,
+	TILE_CLUB_STAIRS3 = 20,
+	TILE_CLUB_STAIRS4 = 21,
+	TILE_CLUB_STAIRS5 = 22,
+	TILE_CLUB_STAIRS6 = 23,
+	TILE_CLUB_STAIRS7 = 24,
+	TILE_CLUB_STAIRS8 = 25,
+	TILE_CLUB_STAIRS9 = 26,
+	TILE_CLUB_STAIRS10 = 27,
+	TILE_CLUB_STAIRS11 = 28,
+	TILE_CLUB_STAIRS12 = 29,
+	TILE_CLUB_STAIRS13 = 30,
 
 	TILE_END,
 } tile_type;
diff --git a/include/objects.h b/include/objects.h
index 4edd85e..3ff7939 100644
--- a/include/objects.h
+++ b/include/objects.h
@@ -44,6 +44,18 @@ typedef enum t_object_type {
 	OBJECT_BAR_H = 21,
 	OBJECT_BAR_V = 22,
 	OBJECT_BAR_HV = 23,
+	OBJECT_CLUB_SEAT1 = 24,
+	OBJECT_CLUB_SEAT2 = 25,
+	OBJECT_CLUB_SEAT3 = 26,
+	OBJECT_CLUB_SEAT4 = 27,
+	OBJECT_CLUB_WALL1 = 28,
+	OBJECT_CLUB_WALL2 = 29,
+	OBJECT_CLUB_WALL3 = 30,
+	OBJECT_CLUB_SEAT5 = 31,
+	OBJECT_CLUB_SEAT6 = 32,
+	OBJECT_CLUB_SEAT7 = 33,
+	OBJECT_BOWLING_LANE = 34,
+	OBJECT_BOWLING_LANE_END = 35,
 
 	OBJECT_END,
 } object_type;
@@ -102,6 +114,18 @@ object object_dict[OBJECT_END] = {
 	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_BAR_H, 1},
 	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_BAR_V, 1},
 	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_BAR_HV, 1},
+	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT1, 1},
+	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT2, 1},
+	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT3, 1},
+	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT4, 1},
+	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_WALL1, 1},
+	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_WALL2, 1},
+	{0,(vec3f){0, 0, 0},{1,1,1.0f},OBJECT_CLUB_WALL3, 1},
+	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT5, 1},
+	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT6, 1},
+	{0,(vec3f){0, 0, 0},{1,1,0.5f},OBJECT_CLUB_SEAT7, 1},
+	{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},
 };
 
 object get_object_at_tile(float x, float y);
-- 
cgit v1.2.3-70-g09d2