club and bowling assets

70 files changed, 151 insertions, 13 deletions

diff --git a/data/imgs/objects/bowling_lane.png b/data/imgs/objects/bowling_lane.png
new file mode 100644
index 0000000..ef108f0
--- /dev/null
+++ b/data/imgs/objects/bowling_lane.png
diff --git a/data/imgs/objects/bowling_lane_end.png b/data/imgs/objects/bowling_lane_end.png
new file mode 100644
index 0000000..1c906c3
--- /dev/null
+++ b/data/imgs/objects/bowling_lane_end.png
diff --git a/data/imgs/objects/club_seat1.png b/data/imgs/objects/club_seat1.png
new file mode 100644
index 0000000..5a14aca
--- /dev/null
+++ b/data/imgs/objects/club_seat1.png
diff --git a/data/imgs/objects/club_seat2.png b/data/imgs/objects/club_seat2.png
new file mode 100644
index 0000000..1d27068
--- /dev/null
+++ b/data/imgs/objects/club_seat2.png
diff --git a/data/imgs/objects/club_seat3.png b/data/imgs/objects/club_seat3.png
new file mode 100644
index 0000000..eb53c5d
--- /dev/null
+++ b/data/imgs/objects/club_seat3.png
diff --git a/data/imgs/objects/club_seat4.png b/data/imgs/objects/club_seat4.png
new file mode 100644
index 0000000..b3d9ca4
--- /dev/null
+++ b/data/imgs/objects/club_seat4.png
diff --git a/data/imgs/objects/club_seat5.png b/data/imgs/objects/club_seat5.png
new file mode 100644
index 0000000..26278ed
--- /dev/null
+++ b/data/imgs/objects/club_seat5.png
diff --git a/data/imgs/objects/club_seat6.png b/data/imgs/objects/club_seat6.png
new file mode 100644
index 0000000..b9faba7
--- /dev/null
+++ b/data/imgs/objects/club_seat6.png
diff --git a/data/imgs/objects/club_seat7.png b/data/imgs/objects/club_seat7.png
new file mode 100644
index 0000000..3bea169
--- /dev/null
+++ b/data/imgs/objects/club_seat7.png
diff --git a/data/imgs/objects/club_wall1.png b/data/imgs/objects/club_wall1.png
new file mode 100644
index 0000000..5f3e654
--- /dev/null
+++ b/data/imgs/objects/club_wall1.png
diff --git a/data/imgs/objects/club_wall2.png b/data/imgs/objects/club_wall2.png
new file mode 100644
index 0000000..7528681
--- /dev/null
+++ b/data/imgs/objects/club_wall2.png
diff --git a/data/imgs/objects/club_wall3.png b/data/imgs/objects/club_wall3.png
new file mode 100644
index 0000000..5a52b56
--- /dev/null
+++ b/data/imgs/objects/club_wall3.png
diff --git a/data/imgs/tiles/club_stairs1.png b/data/imgs/tiles/club_stairs1.png
new file mode 100644
index 0000000..2f8668d
--- /dev/null
+++ b/data/imgs/tiles/club_stairs1.png
diff --git a/data/imgs/tiles/club_stairs10.png b/data/imgs/tiles/club_stairs10.png
new file mode 100644
index 0000000..82608ad
--- /dev/null
+++ b/data/imgs/tiles/club_stairs10.png
diff --git a/data/imgs/tiles/club_stairs11.png b/data/imgs/tiles/club_stairs11.png
new file mode 100644
index 0000000..89fc2e2
--- /dev/null
+++ b/data/imgs/tiles/club_stairs11.png
diff --git a/data/imgs/tiles/club_stairs12.png b/data/imgs/tiles/club_stairs12.png
new file mode 100644
index 0000000..ddefe11
--- /dev/null
+++ b/data/imgs/tiles/club_stairs12.png
diff --git a/data/imgs/tiles/club_stairs13.png b/data/imgs/tiles/club_stairs13.png
new file mode 100644
index 0000000..8880e8f
--- /dev/null
+++ b/data/imgs/tiles/club_stairs13.png
diff --git a/data/imgs/tiles/club_stairs2.png b/data/imgs/tiles/club_stairs2.png
new file mode 100644
index 0000000..53d9f46
--- /dev/null
+++ b/data/imgs/tiles/club_stairs2.png
diff --git a/data/imgs/tiles/club_stairs3.png b/data/imgs/tiles/club_stairs3.png
new file mode 100644
index 0000000..51c59cb
--- /dev/null
+++ b/data/imgs/tiles/club_stairs3.png
diff --git a/data/imgs/tiles/club_stairs4.png b/data/imgs/tiles/club_stairs4.png
new file mode 100644
index 0000000..ebfe9ae
--- /dev/null
+++ b/data/imgs/tiles/club_stairs4.png
diff --git a/data/imgs/tiles/club_stairs5.png b/data/imgs/tiles/club_stairs5.png
new file mode 100644
index 0000000..3e27a7a
--- /dev/null
+++ b/data/imgs/tiles/club_stairs5.png
diff --git a/data/imgs/tiles/club_stairs6.png b/data/imgs/tiles/club_stairs6.png
new file mode 100644
index 0000000..b9cd62c
--- /dev/null
+++ b/data/imgs/tiles/club_stairs6.png
diff --git a/data/imgs/tiles/club_stairs7.png b/data/imgs/tiles/club_stairs7.png
new file mode 100644
index 0000000..61f9ec6
--- /dev/null
+++ b/data/imgs/tiles/club_stairs7.png
diff --git a/data/imgs/tiles/club_stairs8.png b/data/imgs/tiles/club_stairs8.png
new file mode 100644
index 0000000..69e53da
--- /dev/null
+++ b/data/imgs/tiles/club_stairs8.png
diff --git a/data/imgs/tiles/club_stairs9.png b/data/imgs/tiles/club_stairs9.png
new file mode 100644
index 0000000..cf284b8
--- /dev/null
+++ b/data/imgs/tiles/club_stairs9.png
diff --git a/data/imgs/tiles/tile_carpet_stairs_v.png b/data/imgs/tiles/tile_carpet_stairs_v.png
new file mode 100644
index 0000000..7e34b31
--- /dev/null
+++ b/data/imgs/tiles/tile_carpet_stairs_v.png
diff --git a/data/imgs/tiles/tile_club1.png b/data/imgs/tiles/tile_club1.png
new file mode 100644
index 0000000..ff20568
--- /dev/null
+++ b/data/imgs/tiles/tile_club1.png
diff --git a/data/imgs/tiles/tile_club2.png b/data/imgs/tiles/tile_club2.png
new file mode 100644
index 0000000..56ba0b2
--- /dev/null
+++ b/data/imgs/tiles/tile_club2.png
diff --git a/data/imgs/tiles/tile_club3.png b/data/imgs/tiles/tile_club3.png
new file mode 100644
index 0000000..71d30d6
--- /dev/null
+++ b/data/imgs/tiles/tile_club3.png
diff --git a/data/imgs/tiles/tile_club4.png b/data/imgs/tiles/tile_club4.png
new file mode 100644
index 0000000..5b36af0
--- /dev/null
+++ b/data/imgs/tiles/tile_club4.png
diff --git a/data/maps/map1.dat b/data/maps/map1.dat
index 6ffa434..adbdbb9 100644
--- a/data/maps/map1.dat
+++ b/data/maps/map1.dat
diff --git a/data/psd/bar_v.psd b/data/psd/bar_v.psd
index 9814618..386af1d 100644
--- a/data/psd/bar_v.psd
+++ b/data/psd/bar_v.psd
diff --git a/data/psd/bowling_lane.psd b/data/psd/bowling_lane.psd
new file mode 100644
index 0000000..2f77354
--- /dev/null
+++ b/data/psd/bowling_lane.psd
diff --git a/data/psd/bowling_lane_end.psd b/data/psd/bowling_lane_end.psd
new file mode 100644
index 0000000..faaa04b
--- /dev/null
+++ b/data/psd/bowling_lane_end.psd
diff --git a/data/psd/club_seat1.psd b/data/psd/club_seat1.psd
new file mode 100644
index 0000000..0a952d5
--- /dev/null
+++ b/data/psd/club_seat1.psd
diff --git a/data/psd/club_seat2.psd b/data/psd/club_seat2.psd
new file mode 100644
index 0000000..4ccddb7
--- /dev/null
+++ b/data/psd/club_seat2.psd
diff --git a/data/psd/club_seat3.psd b/data/psd/club_seat3.psd
new file mode 100644
index 0000000..c0ca5e5
--- /dev/null
+++ b/data/psd/club_seat3.psd
diff --git a/data/psd/club_seat4.psd b/data/psd/club_seat4.psd
new file mode 100644
index 0000000..1360cfc
--- /dev/null
+++ b/data/psd/club_seat4.psd
diff --git a/data/psd/club_seat5.psd b/data/psd/club_seat5.psd
new file mode 100644
index 0000000..f60bf5b
--- /dev/null
+++ b/data/psd/club_seat5.psd
diff --git a/data/psd/club_seat6.psd b/data/psd/club_seat6.psd
new file mode 100644
index 0000000..945e074
--- /dev/null
+++ b/data/psd/club_seat6.psd
diff --git a/data/psd/club_stairs1.psd b/data/psd/club_stairs1.psd
new file mode 100644
index 0000000..c623cb4
--- /dev/null
+++ b/data/psd/club_stairs1.psd
diff --git a/data/psd/club_stairs10.psd b/data/psd/club_stairs10.psd
new file mode 100644
index 0000000..b9a70e6
--- /dev/null
+++ b/data/psd/club_stairs10.psd
diff --git a/data/psd/club_stairs11.psd b/data/psd/club_stairs11.psd
new file mode 100644
index 0000000..033f3e9
--- /dev/null
+++ b/data/psd/club_stairs11.psd
diff --git a/data/psd/club_stairs12.psd b/data/psd/club_stairs12.psd
new file mode 100644
index 0000000..6782d07
--- /dev/null
+++ b/data/psd/club_stairs12.psd
diff --git a/data/psd/club_stairs13.psd b/data/psd/club_stairs13.psd
new file mode 100644
index 0000000..4ffe9c5
--- /dev/null
+++ b/data/psd/club_stairs13.psd
diff --git a/data/psd/club_stairs2.psd b/data/psd/club_stairs2.psd
new file mode 100644
index 0000000..2574b7d
--- /dev/null
+++ b/data/psd/club_stairs2.psd
diff --git a/data/psd/club_stairs3.psd b/data/psd/club_stairs3.psd
new file mode 100644
index 0000000..66bd800
--- /dev/null
+++ b/data/psd/club_stairs3.psd
diff --git a/data/psd/club_stairs4.psd b/data/psd/club_stairs4.psd
new file mode 100644
index 0000000..ee8a0d8
--- /dev/null
+++ b/data/psd/club_stairs4.psd
diff --git a/data/psd/club_stairs5.psd b/data/psd/club_stairs5.psd
new file mode 100644
index 0000000..5896fd7
--- /dev/null
+++ b/data/psd/club_stairs5.psd
diff --git a/data/psd/club_stairs6.psd b/data/psd/club_stairs6.psd
new file mode 100644
index 0000000..4772981
--- /dev/null
+++ b/data/psd/club_stairs6.psd
diff --git a/data/psd/club_stairs7.psd b/data/psd/club_stairs7.psd
new file mode 100644
index 0000000..51815f2
--- /dev/null
+++ b/data/psd/club_stairs7.psd
diff --git a/data/psd/club_stairs8.psd b/data/psd/club_stairs8.psd
new file mode 100644
index 0000000..bfd03d5
--- /dev/null
+++ b/data/psd/club_stairs8.psd
diff --git a/data/psd/club_stairs9.psd b/data/psd/club_stairs9.psd
new file mode 100644
index 0000000..1bb08aa
--- /dev/null
+++ b/data/psd/club_stairs9.psd
diff --git a/data/psd/club_wall1.psd b/data/psd/club_wall1.psd
new file mode 100644
index 0000000..c2f7f3f
--- /dev/null
+++ b/data/psd/club_wall1.psd
diff --git a/data/psd/club_wall2.psd b/data/psd/club_wall2.psd
new file mode 100644
index 0000000..2be5d63
--- /dev/null
+++ b/data/psd/club_wall2.psd
diff --git a/data/psd/club_wall3.psd b/data/psd/club_wall3.psd
new file mode 100644
index 0000000..2a5bc38
--- /dev/null
+++ b/data/psd/club_wall3.psd
diff --git a/data/psd/tile_carpet_stairs_v.psd b/data/psd/tile_carpet_stairs_v.psd
new file mode 100644
index 0000000..31efa31
--- /dev/null
+++ b/data/psd/tile_carpet_stairs_v.psd
diff --git a/data/psd/tile_club1.psd b/data/psd/tile_club1.psd
new file mode 100644
index 0000000..ff953b4
--- /dev/null
+++ b/data/psd/tile_club1.psd
diff --git a/data/psd/tile_club2.psd b/data/psd/tile_club2.psd
new file mode 100644
index 0000000..c05a738
--- /dev/null
+++ b/data/psd/tile_club2.psd
diff --git a/data/psd/tile_club3.psd b/data/psd/tile_club3.psd
new file mode 100644
index 0000000..b720a35
--- /dev/null
+++ b/data/psd/tile_club3.psd
diff --git a/data/psd/tile_club4.psd b/data/psd/tile_club4.psd
new file mode 100644
index 0000000..68924fd
--- /dev/null
+++ b/data/psd/tile_club4.psd
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);
diff --git a/src/asset_defs.c b/src/asset_defs.c
index 11d5f2d..0e95b50 100644
--- a/src/asset_defs.c
+++ b/src/asset_defs.c
@@ -79,6 +79,18 @@ void load_assets() { // Assets loaded at match start.
 	img_bar_h = assets_load_image_from_file("data/imgs/objects/bar_h.png");
 	img_bar_v = assets_load_image_from_file("data/imgs/objects/bar_v.png");
 	img_bar_hv = assets_load_image_from_file("data/imgs/objects/bar_hv.png");
+	img_club_seat1 = assets_load_image_from_file("data/imgs/objects/club_seat1.png");
+	img_club_seat2 = assets_load_image_from_file("data/imgs/objects/club_seat2.png");
+	img_club_seat3 = assets_load_image_from_file("data/imgs/objects/club_seat3.png");
+	img_club_seat4 = assets_load_image_from_file("data/imgs/objects/club_seat4.png");
+	img_club_wall1 = assets_load_image_from_file("data/imgs/objects/club_wall1.png");
+	img_club_wall2 = assets_load_image_from_file("data/imgs/objects/club_wall2.png");
+	img_club_wall3 = assets_load_image_from_file("data/imgs/objects/club_wall3.png");
+	img_club_seat5 = assets_load_image_from_file("data/imgs/objects/club_seat5.png");
+	img_club_seat6 = assets_load_image_from_file("data/imgs/objects/club_seat6.png");
+	img_club_seat7 = assets_load_image_from_file("data/imgs/objects/club_seat7.png");
+	img_bowling_lane = assets_load_image_from_file("data/imgs/objects/bowling_lane.png");
+	img_bowling_lane_end = assets_load_image_from_file("data/imgs/objects/bowling_lane_end.png");
 
 	// Players
 	img_gunner_black_run = assets_load_image_from_file("data/imgs/players/Black/Gunner_Black_Run.png");
@@ -128,6 +140,24 @@ void load_assets() { // Assets loaded at match start.
 	img_tile_carpet3 = assets_load_image_from_file("data/imgs/tiles/tile_carpet3.png");
 	img_tile_carpet4 = assets_load_image_from_file("data/imgs/tiles/tile_carpet4.png");
 	img_tile_carpet5 = assets_load_image_from_file("data/imgs/tiles/tile_carpet5.png");
+	img_tile_carpet_stairs_v = assets_load_image_from_file("data/imgs/tiles/tile_carpet_stairs_v.png");
+	img_tile_club1 = assets_load_image_from_file("data/imgs/tiles/tile_club1.png");
+	img_tile_club2 = assets_load_image_from_file("data/imgs/tiles/tile_club2.png");
+	img_tile_club3 = assets_load_image_from_file("data/imgs/tiles/tile_club3.png");
+	img_tile_club4 = assets_load_image_from_file("data/imgs/tiles/tile_club4.png");
+	img_tile_club_stairs1 = assets_load_image_from_file("data/imgs/tiles/club_stairs1.png");
+	img_tile_club_stairs2 = assets_load_image_from_file("data/imgs/tiles/club_stairs2.png");
+	img_tile_club_stairs3 = assets_load_image_from_file("data/imgs/tiles/club_stairs3.png");
+	img_tile_club_stairs4 = assets_load_image_from_file("data/imgs/tiles/club_stairs4.png");
+	img_tile_club_stairs5 = assets_load_image_from_file("data/imgs/tiles/club_stairs5.png");
+	img_tile_club_stairs6 = assets_load_image_from_file("data/imgs/tiles/club_stairs6.png");
+	img_tile_club_stairs7 = assets_load_image_from_file("data/imgs/tiles/club_stairs7.png");
+	img_tile_club_stairs8 = assets_load_image_from_file("data/imgs/tiles/club_stairs8.png");
+	img_tile_club_stairs9 = assets_load_image_from_file("data/imgs/tiles/club_stairs9.png");
+	img_tile_club_stairs10 = assets_load_image_from_file("data/imgs/tiles/club_stairs10.png");
+	img_tile_club_stairs11 = assets_load_image_from_file("data/imgs/tiles/club_stairs11.png");
+	img_tile_club_stairs12 = assets_load_image_from_file("data/imgs/tiles/club_stairs12.png");
+	img_tile_club_stairs13 = assets_load_image_from_file("data/imgs/tiles/club_stairs13.png");
 
 	// sounds
 	wav_throwable_bounce = Mix_LoadWAV("data/sounds/throwable_bounce.wav");
diff --git a/src/game.c b/src/game.c
index 5123d1a..6081df1 100644
--- a/src/game.c
+++ b/src/game.c
@@ -43,6 +43,7 @@ bool connect_to_server(char* ip, char* port) {
 		player_id = 127001;
 		spawn_player(player_id, (network_client){0, false, 0, "Host"});
 		global_state.network_state = CONNECTED;
+		return true;
 	}
 	else {
 		if (global_state.client->is_connected) {
diff --git a/src/map.c b/src/map.c
index d2e44d9..9b21725 100644
--- a/src/map.c
+++ b/src/map.c
@@ -398,6 +398,24 @@ image* get_image_from_tiletype(tile_type tile) {
 		case TILE_CARPET3: return img_tile_carpet3;
 		case TILE_CARPET4: return img_tile_carpet4;
 		case TILE_CARPET5: return img_tile_carpet5;
+		case TILE_CARPET_STAIRS_v: return img_tile_carpet_stairs_v;
+		case TILE_CLUB1: return img_tile_club1;
+		case TILE_CLUB2: return img_tile_club2;
+		case TILE_CLUB3: return img_tile_club3;
+		case TILE_CLUB4: return img_tile_club4;
+		case TILE_CLUB_STAIRS1: return img_tile_club_stairs1;
+		case TILE_CLUB_STAIRS2: return img_tile_club_stairs2;
+		case TILE_CLUB_STAIRS3: return img_tile_club_stairs3;
+		case TILE_CLUB_STAIRS4: return img_tile_club_stairs4;
+		case TILE_CLUB_STAIRS5: return img_tile_club_stairs5;
+		case TILE_CLUB_STAIRS6: return img_tile_club_stairs6;
+		case TILE_CLUB_STAIRS7: return img_tile_club_stairs7;
+		case TILE_CLUB_STAIRS8: return img_tile_club_stairs8;
+		case TILE_CLUB_STAIRS9: return img_tile_club_stairs9;
+		case TILE_CLUB_STAIRS10: return img_tile_club_stairs10;
+		case TILE_CLUB_STAIRS11: return img_tile_club_stairs11;
+		case TILE_CLUB_STAIRS12: return img_tile_club_stairs12;
+		case TILE_CLUB_STAIRS13: return img_tile_club_stairs13;
 		default: return 0;
 	}
 }
diff --git a/src/objects.c b/src/objects.c
index 392056b..c6788db 100644
--- a/src/objects.c
+++ b/src/objects.c
@@ -143,6 +143,30 @@ image* get_image_from_objecttype(object_type tile) {
 		return img_bar_v;
 	case OBJECT_BAR_HV:
 		return img_bar_hv;
+	case OBJECT_CLUB_WALL1:
+		return img_club_wall1;
+	case OBJECT_CLUB_WALL2:
+		return img_club_wall2;
+	case OBJECT_CLUB_SEAT1:
+		return img_club_seat1;
+	case OBJECT_CLUB_SEAT2:
+		return img_club_seat2;
+	case OBJECT_CLUB_SEAT3:
+		return img_club_seat3;
+	case OBJECT_CLUB_SEAT4:
+		return img_club_seat4;
+	case OBJECT_CLUB_SEAT5:
+		return img_club_seat5;
+	case OBJECT_CLUB_SEAT6:
+		return img_club_seat6;
+	case OBJECT_CLUB_SEAT7:
+		return img_club_seat7;
+	case OBJECT_CLUB_WALL3:
+		return img_club_wall3;
+	case OBJECT_BOWLING_LANE:
+		return img_bowling_lane;
+	case OBJECT_BOWLING_LANE_END:
+		return img_bowling_lane_end;
 	default:
 		return 0;
 	}
@@ -151,7 +175,7 @@ image* get_image_from_objecttype(object_type tile) {
 void draw_objects(platform_window* window) {
 	map_info info = get_map_info(window);
 
-	uint32_t prev_y = 0;
+	float prev_y = 0;
 	for (int i = 0; i < MAX_OBJECTS; i++) {
 		if (!loaded_map.objects[i].active) continue;
 		object o = loaded_map.objects[i];
@@ -167,8 +191,8 @@ void draw_objects(platform_window* window) {
 		}
 		//render_box_outline(box, rgb(255,0,0));
 
-		if (prev_y < o.position.y) {
-			prev_y = o.position.y;
+		if (prev_y < o.position.y-1) {
+			prev_y = o.position.y-1;
 			draw_zombies(window, prev_y, prev_y);
 			#ifdef MODE_DEBUG 
 			if (!is_editing_map) 
@@ -177,13 +201,6 @@ void draw_objects(platform_window* window) {
 			draw_glass_doors(window, prev_y, prev_y);
 		}
 	}
-
-	draw_zombies(window, prev_y, MAP_SIZE_Y);
-	#ifdef MODE_DEBUG 
-			if (!is_editing_map) 
-	#endif
-	draw_players(window, prev_y, MAP_SIZE_Y);
-	draw_glass_doors(window, prev_y, MAP_SIZE_Y);
 }
 
 void create_objects() {
diff --git a/src/players.c b/src/players.c
index b5d0666..b4b744d 100644
--- a/src/players.c
+++ b/src/players.c
@@ -128,7 +128,7 @@ void add_points_to_player(player* p, u32 points) {
 
 
 void move_user(platform_window* window, u32 id, protocol_move_type move, float delta) {
-	float speed_straight = 5.5f;
+	float speed_straight = 15.5f;
 	float speed = speed_straight * delta;
 	float pad_between_player_and_obj = 0.01f;
 
diff --git a/src/zombies.c b/src/zombies.c
index 13368f2..1e3e05b 100644
--- a/src/zombies.c
+++ b/src/zombies.c
@@ -112,7 +112,7 @@ static vec2f get_random_target_for_zombie(zombie o) {
 	if (target.x >= MAP_SIZE_X-1 || target.y >= MAP_SIZE_Y-1) goto try_again;
 	
 	object obj = get_object_at_tile(target.x, target.y);
-	if (obj.active) goto try_again;
+	if (obj.active && obj.active) goto try_again;
 	
 	return target;
 }
@@ -326,7 +326,7 @@ static vec2f get_random_point_around_player(player p, zombie o) {
 	float y = (float)(radius * sin(angleInDegrees * M_PI / 180.0f)) + p.playery;
 
 	object obj = get_object_at_tile(x, y);
-	if (obj.active) goto try_again;
+	if (obj.active && obj.collision) goto try_again;
 	
 	return (vec2f){x, y};
 }