From e2fb2bc2072f7d404a1c1664836d25b84b6fad03 Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Wed, 15 May 2024 22:08:10 +0200 Subject: club and bowling assets --- data/imgs/objects/bowling_lane.png | Bin 0 -> 1269 bytes data/imgs/objects/bowling_lane_end.png | Bin 0 -> 6764 bytes data/imgs/objects/club_seat1.png | Bin 0 -> 25782 bytes data/imgs/objects/club_seat2.png | Bin 0 -> 3144 bytes data/imgs/objects/club_seat3.png | Bin 0 -> 4099 bytes data/imgs/objects/club_seat4.png | Bin 0 -> 8413 bytes data/imgs/objects/club_seat5.png | Bin 0 -> 20047 bytes data/imgs/objects/club_seat6.png | Bin 0 -> 20015 bytes data/imgs/objects/club_seat7.png | Bin 0 -> 20543 bytes data/imgs/objects/club_wall1.png | Bin 0 -> 43657 bytes data/imgs/objects/club_wall2.png | Bin 0 -> 41838 bytes data/imgs/objects/club_wall3.png | Bin 0 -> 6539 bytes data/imgs/tiles/club_stairs1.png | Bin 0 -> 795 bytes data/imgs/tiles/club_stairs10.png | Bin 0 -> 806 bytes data/imgs/tiles/club_stairs11.png | Bin 0 -> 475 bytes data/imgs/tiles/club_stairs12.png | Bin 0 -> 653 bytes data/imgs/tiles/club_stairs13.png | Bin 0 -> 1654 bytes data/imgs/tiles/club_stairs2.png | Bin 0 -> 563 bytes data/imgs/tiles/club_stairs3.png | Bin 0 -> 565 bytes data/imgs/tiles/club_stairs4.png | Bin 0 -> 774 bytes data/imgs/tiles/club_stairs5.png | Bin 0 -> 524 bytes data/imgs/tiles/club_stairs6.png | Bin 0 -> 558 bytes data/imgs/tiles/club_stairs7.png | Bin 0 -> 810 bytes data/imgs/tiles/club_stairs8.png | Bin 0 -> 489 bytes data/imgs/tiles/club_stairs9.png | Bin 0 -> 657 bytes data/imgs/tiles/tile_carpet_stairs_v.png | Bin 0 -> 295 bytes data/imgs/tiles/tile_club1.png | Bin 0 -> 1252 bytes data/imgs/tiles/tile_club2.png | Bin 0 -> 1023 bytes data/imgs/tiles/tile_club3.png | Bin 0 -> 1529 bytes data/imgs/tiles/tile_club4.png | Bin 0 -> 2110 bytes data/maps/map1.dat | Bin 8384008 -> 8384008 bytes data/psd/bar_v.psd | Bin 153746 -> 114250 bytes data/psd/bowling_lane.psd | Bin 0 -> 207556 bytes data/psd/bowling_lane_end.psd | Bin 0 -> 81353 bytes data/psd/club_seat1.psd | Bin 0 -> 110422 bytes data/psd/club_seat2.psd | Bin 0 -> 164892 bytes data/psd/club_seat3.psd | Bin 0 -> 453640 bytes data/psd/club_seat4.psd | Bin 0 -> 663858 bytes data/psd/club_seat5.psd | Bin 0 -> 119656 bytes data/psd/club_seat6.psd | Bin 0 -> 118990 bytes data/psd/club_stairs1.psd | Bin 0 -> 28405 bytes data/psd/club_stairs10.psd | Bin 0 -> 28645 bytes data/psd/club_stairs11.psd | Bin 0 -> 15864 bytes data/psd/club_stairs12.psd | Bin 0 -> 20350 bytes data/psd/club_stairs13.psd | Bin 0 -> 25480 bytes data/psd/club_stairs2.psd | Bin 0 -> 23448 bytes data/psd/club_stairs3.psd | Bin 0 -> 17346 bytes data/psd/club_stairs4.psd | Bin 0 -> 28381 bytes data/psd/club_stairs5.psd | Bin 0 -> 15858 bytes data/psd/club_stairs6.psd | Bin 0 -> 20356 bytes data/psd/club_stairs7.psd | Bin 0 -> 28663 bytes data/psd/club_stairs8.psd | Bin 0 -> 15884 bytes data/psd/club_stairs9.psd | Bin 0 -> 17348 bytes data/psd/club_wall1.psd | Bin 0 -> 231098 bytes data/psd/club_wall2.psd | Bin 0 -> 406209 bytes data/psd/club_wall3.psd | Bin 0 -> 99968 bytes data/psd/tile_carpet_stairs_v.psd | Bin 0 -> 18346 bytes data/psd/tile_club1.psd | Bin 0 -> 18095 bytes data/psd/tile_club2.psd | Bin 0 -> 14196 bytes data/psd/tile_club3.psd | Bin 0 -> 13941 bytes data/psd/tile_club4.psd | Bin 0 -> 19778 bytes include/asset_defs.h | 30 +++++++++++++++++++++++++ include/map.h | 18 +++++++++++++++ include/objects.h | 24 ++++++++++++++++++++ src/asset_defs.c | 30 +++++++++++++++++++++++++ src/game.c | 1 + src/map.c | 18 +++++++++++++++ src/objects.c | 37 ++++++++++++++++++++++--------- src/players.c | 2 +- src/zombies.c | 4 ++-- 70 files changed, 151 insertions(+), 13 deletions(-) create mode 100644 data/imgs/objects/bowling_lane.png create mode 100644 data/imgs/objects/bowling_lane_end.png create mode 100644 data/imgs/objects/club_seat1.png create mode 100644 data/imgs/objects/club_seat2.png create mode 100644 data/imgs/objects/club_seat3.png create mode 100644 data/imgs/objects/club_seat4.png create mode 100644 data/imgs/objects/club_seat5.png create mode 100644 data/imgs/objects/club_seat6.png create mode 100644 data/imgs/objects/club_seat7.png create mode 100644 data/imgs/objects/club_wall1.png create mode 100644 data/imgs/objects/club_wall2.png create mode 100644 data/imgs/objects/club_wall3.png create mode 100644 data/imgs/tiles/club_stairs1.png create mode 100644 data/imgs/tiles/club_stairs10.png create mode 100644 data/imgs/tiles/club_stairs11.png create mode 100644 data/imgs/tiles/club_stairs12.png create mode 100644 data/imgs/tiles/club_stairs13.png create mode 100644 data/imgs/tiles/club_stairs2.png create mode 100644 data/imgs/tiles/club_stairs3.png create mode 100644 data/imgs/tiles/club_stairs4.png create mode 100644 data/imgs/tiles/club_stairs5.png create mode 100644 data/imgs/tiles/club_stairs6.png create mode 100644 data/imgs/tiles/club_stairs7.png create mode 100644 data/imgs/tiles/club_stairs8.png create mode 100644 data/imgs/tiles/club_stairs9.png create mode 100644 data/imgs/tiles/tile_carpet_stairs_v.png create mode 100644 data/imgs/tiles/tile_club1.png create mode 100644 data/imgs/tiles/tile_club2.png create mode 100644 data/imgs/tiles/tile_club3.png create mode 100644 data/imgs/tiles/tile_club4.png create mode 100644 data/psd/bowling_lane.psd create mode 100644 data/psd/bowling_lane_end.psd create mode 100644 data/psd/club_seat1.psd create mode 100644 data/psd/club_seat2.psd create mode 100644 data/psd/club_seat3.psd create mode 100644 data/psd/club_seat4.psd create mode 100644 data/psd/club_seat5.psd create mode 100644 data/psd/club_seat6.psd create mode 100644 data/psd/club_stairs1.psd create mode 100644 data/psd/club_stairs10.psd create mode 100644 data/psd/club_stairs11.psd create mode 100644 data/psd/club_stairs12.psd create mode 100644 data/psd/club_stairs13.psd create mode 100644 data/psd/club_stairs2.psd create mode 100644 data/psd/club_stairs3.psd create mode 100644 data/psd/club_stairs4.psd create mode 100644 data/psd/club_stairs5.psd create mode 100644 data/psd/club_stairs6.psd create mode 100644 data/psd/club_stairs7.psd create mode 100644 data/psd/club_stairs8.psd create mode 100644 data/psd/club_stairs9.psd create mode 100644 data/psd/club_wall1.psd create mode 100644 data/psd/club_wall2.psd create mode 100644 data/psd/club_wall3.psd create mode 100644 data/psd/tile_carpet_stairs_v.psd create mode 100644 data/psd/tile_club1.psd create mode 100644 data/psd/tile_club2.psd create mode 100644 data/psd/tile_club3.psd create mode 100644 data/psd/tile_club4.psd diff --git a/data/imgs/objects/bowling_lane.png b/data/imgs/objects/bowling_lane.png new file mode 100644 index 0000000..ef108f0 Binary files /dev/null and b/data/imgs/objects/bowling_lane.png differ 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 Binary files /dev/null and b/data/imgs/objects/bowling_lane_end.png differ diff --git a/data/imgs/objects/club_seat1.png b/data/imgs/objects/club_seat1.png new file mode 100644 index 0000000..5a14aca Binary files /dev/null and b/data/imgs/objects/club_seat1.png differ diff --git a/data/imgs/objects/club_seat2.png b/data/imgs/objects/club_seat2.png new file mode 100644 index 0000000..1d27068 Binary files /dev/null and b/data/imgs/objects/club_seat2.png differ diff --git a/data/imgs/objects/club_seat3.png b/data/imgs/objects/club_seat3.png new file mode 100644 index 0000000..eb53c5d Binary files /dev/null and b/data/imgs/objects/club_seat3.png differ diff --git a/data/imgs/objects/club_seat4.png b/data/imgs/objects/club_seat4.png new file mode 100644 index 0000000..b3d9ca4 Binary files /dev/null and b/data/imgs/objects/club_seat4.png differ diff --git a/data/imgs/objects/club_seat5.png b/data/imgs/objects/club_seat5.png new file mode 100644 index 0000000..26278ed Binary files /dev/null and b/data/imgs/objects/club_seat5.png differ diff --git a/data/imgs/objects/club_seat6.png b/data/imgs/objects/club_seat6.png new file mode 100644 index 0000000..b9faba7 Binary files /dev/null and b/data/imgs/objects/club_seat6.png differ diff --git a/data/imgs/objects/club_seat7.png b/data/imgs/objects/club_seat7.png new file mode 100644 index 0000000..3bea169 Binary files /dev/null and b/data/imgs/objects/club_seat7.png differ diff --git a/data/imgs/objects/club_wall1.png b/data/imgs/objects/club_wall1.png new file mode 100644 index 0000000..5f3e654 Binary files /dev/null and b/data/imgs/objects/club_wall1.png differ diff --git a/data/imgs/objects/club_wall2.png b/data/imgs/objects/club_wall2.png new file mode 100644 index 0000000..7528681 Binary files /dev/null and b/data/imgs/objects/club_wall2.png differ diff --git a/data/imgs/objects/club_wall3.png b/data/imgs/objects/club_wall3.png new file mode 100644 index 0000000..5a52b56 Binary files /dev/null and b/data/imgs/objects/club_wall3.png differ diff --git a/data/imgs/tiles/club_stairs1.png b/data/imgs/tiles/club_stairs1.png new file mode 100644 index 0000000..2f8668d Binary files /dev/null and b/data/imgs/tiles/club_stairs1.png differ diff --git a/data/imgs/tiles/club_stairs10.png b/data/imgs/tiles/club_stairs10.png new file mode 100644 index 0000000..82608ad Binary files /dev/null and b/data/imgs/tiles/club_stairs10.png differ diff --git a/data/imgs/tiles/club_stairs11.png b/data/imgs/tiles/club_stairs11.png new file mode 100644 index 0000000..89fc2e2 Binary files /dev/null and b/data/imgs/tiles/club_stairs11.png differ diff --git a/data/imgs/tiles/club_stairs12.png b/data/imgs/tiles/club_stairs12.png new file mode 100644 index 0000000..ddefe11 Binary files /dev/null and b/data/imgs/tiles/club_stairs12.png differ diff --git a/data/imgs/tiles/club_stairs13.png b/data/imgs/tiles/club_stairs13.png new file mode 100644 index 0000000..8880e8f Binary files /dev/null and b/data/imgs/tiles/club_stairs13.png differ diff --git a/data/imgs/tiles/club_stairs2.png b/data/imgs/tiles/club_stairs2.png new file mode 100644 index 0000000..53d9f46 Binary files /dev/null and b/data/imgs/tiles/club_stairs2.png differ diff --git a/data/imgs/tiles/club_stairs3.png b/data/imgs/tiles/club_stairs3.png new file mode 100644 index 0000000..51c59cb Binary files /dev/null and b/data/imgs/tiles/club_stairs3.png differ diff --git a/data/imgs/tiles/club_stairs4.png b/data/imgs/tiles/club_stairs4.png new file mode 100644 index 0000000..ebfe9ae Binary files /dev/null and b/data/imgs/tiles/club_stairs4.png differ diff --git a/data/imgs/tiles/club_stairs5.png b/data/imgs/tiles/club_stairs5.png new file mode 100644 index 0000000..3e27a7a Binary files /dev/null and b/data/imgs/tiles/club_stairs5.png differ diff --git a/data/imgs/tiles/club_stairs6.png b/data/imgs/tiles/club_stairs6.png new file mode 100644 index 0000000..b9cd62c Binary files /dev/null and b/data/imgs/tiles/club_stairs6.png differ diff --git a/data/imgs/tiles/club_stairs7.png b/data/imgs/tiles/club_stairs7.png new file mode 100644 index 0000000..61f9ec6 Binary files /dev/null and b/data/imgs/tiles/club_stairs7.png differ diff --git a/data/imgs/tiles/club_stairs8.png b/data/imgs/tiles/club_stairs8.png new file mode 100644 index 0000000..69e53da Binary files /dev/null and b/data/imgs/tiles/club_stairs8.png differ diff --git a/data/imgs/tiles/club_stairs9.png b/data/imgs/tiles/club_stairs9.png new file mode 100644 index 0000000..cf284b8 Binary files /dev/null and b/data/imgs/tiles/club_stairs9.png differ 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 Binary files /dev/null and b/data/imgs/tiles/tile_carpet_stairs_v.png differ diff --git a/data/imgs/tiles/tile_club1.png b/data/imgs/tiles/tile_club1.png new file mode 100644 index 0000000..ff20568 Binary files /dev/null and b/data/imgs/tiles/tile_club1.png differ diff --git a/data/imgs/tiles/tile_club2.png b/data/imgs/tiles/tile_club2.png new file mode 100644 index 0000000..56ba0b2 Binary files /dev/null and b/data/imgs/tiles/tile_club2.png differ diff --git a/data/imgs/tiles/tile_club3.png b/data/imgs/tiles/tile_club3.png new file mode 100644 index 0000000..71d30d6 Binary files /dev/null and b/data/imgs/tiles/tile_club3.png differ diff --git a/data/imgs/tiles/tile_club4.png b/data/imgs/tiles/tile_club4.png new file mode 100644 index 0000000..5b36af0 Binary files /dev/null and b/data/imgs/tiles/tile_club4.png differ diff --git a/data/maps/map1.dat b/data/maps/map1.dat index 6ffa434..adbdbb9 100644 Binary files a/data/maps/map1.dat and b/data/maps/map1.dat differ diff --git a/data/psd/bar_v.psd b/data/psd/bar_v.psd index 9814618..386af1d 100644 Binary files a/data/psd/bar_v.psd and b/data/psd/bar_v.psd differ diff --git a/data/psd/bowling_lane.psd b/data/psd/bowling_lane.psd new file mode 100644 index 0000000..2f77354 Binary files /dev/null and b/data/psd/bowling_lane.psd differ diff --git a/data/psd/bowling_lane_end.psd b/data/psd/bowling_lane_end.psd new file mode 100644 index 0000000..faaa04b Binary files /dev/null and b/data/psd/bowling_lane_end.psd differ diff --git a/data/psd/club_seat1.psd b/data/psd/club_seat1.psd new file mode 100644 index 0000000..0a952d5 Binary files /dev/null and b/data/psd/club_seat1.psd differ diff --git a/data/psd/club_seat2.psd b/data/psd/club_seat2.psd new file mode 100644 index 0000000..4ccddb7 Binary files /dev/null and b/data/psd/club_seat2.psd differ diff --git a/data/psd/club_seat3.psd b/data/psd/club_seat3.psd new file mode 100644 index 0000000..c0ca5e5 Binary files /dev/null and b/data/psd/club_seat3.psd differ diff --git a/data/psd/club_seat4.psd b/data/psd/club_seat4.psd new file mode 100644 index 0000000..1360cfc Binary files /dev/null and b/data/psd/club_seat4.psd differ diff --git a/data/psd/club_seat5.psd b/data/psd/club_seat5.psd new file mode 100644 index 0000000..f60bf5b Binary files /dev/null and b/data/psd/club_seat5.psd differ diff --git a/data/psd/club_seat6.psd b/data/psd/club_seat6.psd new file mode 100644 index 0000000..945e074 Binary files /dev/null and b/data/psd/club_seat6.psd differ diff --git a/data/psd/club_stairs1.psd b/data/psd/club_stairs1.psd new file mode 100644 index 0000000..c623cb4 Binary files /dev/null and b/data/psd/club_stairs1.psd differ diff --git a/data/psd/club_stairs10.psd b/data/psd/club_stairs10.psd new file mode 100644 index 0000000..b9a70e6 Binary files /dev/null and b/data/psd/club_stairs10.psd differ diff --git a/data/psd/club_stairs11.psd b/data/psd/club_stairs11.psd new file mode 100644 index 0000000..033f3e9 Binary files /dev/null and b/data/psd/club_stairs11.psd differ diff --git a/data/psd/club_stairs12.psd b/data/psd/club_stairs12.psd new file mode 100644 index 0000000..6782d07 Binary files /dev/null and b/data/psd/club_stairs12.psd differ diff --git a/data/psd/club_stairs13.psd b/data/psd/club_stairs13.psd new file mode 100644 index 0000000..4ffe9c5 Binary files /dev/null and b/data/psd/club_stairs13.psd differ diff --git a/data/psd/club_stairs2.psd b/data/psd/club_stairs2.psd new file mode 100644 index 0000000..2574b7d Binary files /dev/null and b/data/psd/club_stairs2.psd differ diff --git a/data/psd/club_stairs3.psd b/data/psd/club_stairs3.psd new file mode 100644 index 0000000..66bd800 Binary files /dev/null and b/data/psd/club_stairs3.psd differ diff --git a/data/psd/club_stairs4.psd b/data/psd/club_stairs4.psd new file mode 100644 index 0000000..ee8a0d8 Binary files /dev/null and b/data/psd/club_stairs4.psd differ diff --git a/data/psd/club_stairs5.psd b/data/psd/club_stairs5.psd new file mode 100644 index 0000000..5896fd7 Binary files /dev/null and b/data/psd/club_stairs5.psd differ diff --git a/data/psd/club_stairs6.psd b/data/psd/club_stairs6.psd new file mode 100644 index 0000000..4772981 Binary files /dev/null and b/data/psd/club_stairs6.psd differ diff --git a/data/psd/club_stairs7.psd b/data/psd/club_stairs7.psd new file mode 100644 index 0000000..51815f2 Binary files /dev/null and b/data/psd/club_stairs7.psd differ diff --git a/data/psd/club_stairs8.psd b/data/psd/club_stairs8.psd new file mode 100644 index 0000000..bfd03d5 Binary files /dev/null and b/data/psd/club_stairs8.psd differ diff --git a/data/psd/club_stairs9.psd b/data/psd/club_stairs9.psd new file mode 100644 index 0000000..1bb08aa Binary files /dev/null and b/data/psd/club_stairs9.psd differ diff --git a/data/psd/club_wall1.psd b/data/psd/club_wall1.psd new file mode 100644 index 0000000..c2f7f3f Binary files /dev/null and b/data/psd/club_wall1.psd differ diff --git a/data/psd/club_wall2.psd b/data/psd/club_wall2.psd new file mode 100644 index 0000000..2be5d63 Binary files /dev/null and b/data/psd/club_wall2.psd differ diff --git a/data/psd/club_wall3.psd b/data/psd/club_wall3.psd new file mode 100644 index 0000000..2a5bc38 Binary files /dev/null and b/data/psd/club_wall3.psd differ 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 Binary files /dev/null and b/data/psd/tile_carpet_stairs_v.psd differ diff --git a/data/psd/tile_club1.psd b/data/psd/tile_club1.psd new file mode 100644 index 0000000..ff953b4 Binary files /dev/null and b/data/psd/tile_club1.psd differ diff --git a/data/psd/tile_club2.psd b/data/psd/tile_club2.psd new file mode 100644 index 0000000..c05a738 Binary files /dev/null and b/data/psd/tile_club2.psd differ diff --git a/data/psd/tile_club3.psd b/data/psd/tile_club3.psd new file mode 100644 index 0000000..b720a35 Binary files /dev/null and b/data/psd/tile_club3.psd differ diff --git a/data/psd/tile_club4.psd b/data/psd/tile_club4.psd new file mode 100644 index 0000000..68924fd Binary files /dev/null and b/data/psd/tile_club4.psd differ 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}; } -- cgit v1.2.3-70-g09d2