From 00d2b70189bb564ab2a4f7ba6fc303dda712376f Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Wed, 15 May 2024 12:09:08 +0200 Subject: bar objects --- data/imgs/objects/bar_h.png | Bin 0 -> 20657 bytes data/imgs/objects/bar_hv.png | Bin 0 -> 24633 bytes data/imgs/objects/bar_v.png | Bin 0 -> 14125 bytes data/maps/map1.dat | Bin 8384008 -> 8384008 bytes data/psd/bar_h.psd | Bin 0 -> 250851 bytes data/psd/bar_hv.psd | Bin 0 -> 204153 bytes data/psd/bar_v.psd | Bin 0 -> 153746 bytes include/asset_defs.h | 3 +++ include/objects.h | 6 ++++++ issues | 4 ++-- src/asset_defs.c | 3 +++ src/objects.c | 6 ++++++ 12 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 data/imgs/objects/bar_h.png create mode 100644 data/imgs/objects/bar_hv.png create mode 100644 data/imgs/objects/bar_v.png create mode 100644 data/psd/bar_h.psd create mode 100644 data/psd/bar_hv.psd create mode 100644 data/psd/bar_v.psd diff --git a/data/imgs/objects/bar_h.png b/data/imgs/objects/bar_h.png new file mode 100644 index 0000000..127a5b1 Binary files /dev/null and b/data/imgs/objects/bar_h.png differ diff --git a/data/imgs/objects/bar_hv.png b/data/imgs/objects/bar_hv.png new file mode 100644 index 0000000..ddf6933 Binary files /dev/null and b/data/imgs/objects/bar_hv.png differ diff --git a/data/imgs/objects/bar_v.png b/data/imgs/objects/bar_v.png new file mode 100644 index 0000000..072308d Binary files /dev/null and b/data/imgs/objects/bar_v.png differ diff --git a/data/maps/map1.dat b/data/maps/map1.dat index fcfd204..6ffa434 100644 Binary files a/data/maps/map1.dat and b/data/maps/map1.dat differ diff --git a/data/psd/bar_h.psd b/data/psd/bar_h.psd new file mode 100644 index 0000000..2e7a6b5 Binary files /dev/null and b/data/psd/bar_h.psd differ diff --git a/data/psd/bar_hv.psd b/data/psd/bar_hv.psd new file mode 100644 index 0000000..e458980 Binary files /dev/null and b/data/psd/bar_hv.psd differ diff --git a/data/psd/bar_v.psd b/data/psd/bar_v.psd new file mode 100644 index 0000000..9814618 Binary files /dev/null and b/data/psd/bar_v.psd differ diff --git a/include/asset_defs.h b/include/asset_defs.h index 6bb18e1..8be4c66 100644 --- a/include/asset_defs.h +++ b/include/asset_defs.h @@ -70,6 +70,9 @@ image* img_generator; image* img_school_table; image* img_school_bench; image* img_locker; +image* img_bar_h; +image* img_bar_v; +image* img_bar_hv; // Throwables image* img_grenade; diff --git a/include/objects.h b/include/objects.h index a98f7a7..4edd85e 100644 --- a/include/objects.h +++ b/include/objects.h @@ -41,6 +41,9 @@ typedef enum t_object_type { OBJECT_SCHOOL_TABLE = 18, OBJECT_SCHOOL_BENCH = 19, OBJECT_LOCKER = 20, + OBJECT_BAR_H = 21, + OBJECT_BAR_V = 22, + OBJECT_BAR_HV = 23, OBJECT_END, } object_type; @@ -96,6 +99,9 @@ object object_dict[OBJECT_END] = { {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}, + {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}, }; object get_object_at_tile(float x, float y); diff --git a/issues b/issues index f7f507e..730dd5f 100644 --- a/issues +++ b/issues @@ -1,3 +1,3 @@ - client ping is wrong (platform_get_time is not universal) -- client cant purchase -- client crash allocator out of space \ No newline at end of file +- client crash allocator out of space +- aim cone collides with collision free objects \ No newline at end of file diff --git a/src/asset_defs.c b/src/asset_defs.c index 38cddd4..11d5f2d 100644 --- a/src/asset_defs.c +++ b/src/asset_defs.c @@ -76,6 +76,9 @@ void load_assets() { // Assets loaded at match start. img_school_bench = assets_load_image_from_file("data/imgs/objects/school_bench.png"); img_school_table = assets_load_image_from_file("data/imgs/objects/school_table.png"); img_locker = assets_load_image_from_file("data/imgs/objects/locker.png"); + 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"); // Players img_gunner_black_run = assets_load_image_from_file("data/imgs/players/Black/Gunner_Black_Run.png"); diff --git a/src/objects.c b/src/objects.c index 14d10d8..392056b 100644 --- a/src/objects.c +++ b/src/objects.c @@ -137,6 +137,12 @@ image* get_image_from_objecttype(object_type tile) { return img_school_table; case OBJECT_LOCKER: return img_locker; + case OBJECT_BAR_H: + return img_bar_h; + case OBJECT_BAR_V: + return img_bar_v; + case OBJECT_BAR_HV: + return img_bar_hv; default: return 0; } -- cgit v1.2.3-70-g09d2