From f4611412d0743084fb47d67b8924968d0b0acf97 Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Sun, 12 May 2024 14:20:16 +0200 Subject: generator --- src/asset_defs.c | 1 + src/bullets.c | 3 +++ src/objects.c | 2 ++ src/players.c | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/asset_defs.c b/src/asset_defs.c index 406fc69..390bf94 100644 --- a/src/asset_defs.c +++ b/src/asset_defs.c @@ -61,6 +61,7 @@ void load_assets() { img_glass_door_h_closed = assets_load_image_from_file("data/imgs/objects/glass_door_h_closed.png"); img_big_control_panel = assets_load_image_from_file("data/imgs/objects/big_control_panel.png"); img_computer_rack = assets_load_image_from_file("data/imgs/objects/computer_rack.png"); + img_generator = assets_load_image_from_file("data/imgs/objects/generator.png"); // Players img_gunner_black_run = assets_load_image_from_file("data/imgs/players/Black/Gunner_Black_Run.png"); diff --git a/src/bullets.c b/src/bullets.c index df06f90..7517949 100644 --- a/src/bullets.c +++ b/src/bullets.c @@ -60,8 +60,11 @@ void shoot(platform_window* window, u32 id, float dirx, float diry) { add_audio_event_to_queue(EVENT_RELOAD, p->id, (vec3f){.x = p->playerx, .y = p->playery, .z = p->height}); p->interact_state = INTERACT_RELOADING; p->sec_since_interact_state_change = 0; + //printf("XD!\n"); return; } + //p->interact_state = INTERACT_RELOADING; + //p->sec_since_interact_state_change = 0; } bool check_if_bullet_collided_with_section(float* dist_of_closest_intersect, vec2f bstart, vec2f bend, vec2f l1, vec2f l2, vec2f* intersect_point_buf) { diff --git a/src/objects.c b/src/objects.c index fd2d811..db0295d 100644 --- a/src/objects.c +++ b/src/objects.c @@ -129,6 +129,8 @@ image* get_image_from_objecttype(object_type tile) { return img_chair_down; case OBJECT_COMPUTER_RACK: return img_computer_rack; + case OBJECT_GENERATOR: + return img_generator; default: return 0; } diff --git a/src/players.c b/src/players.c index dd62611..b5d0666 100644 --- a/src/players.c +++ b/src/players.c @@ -430,7 +430,7 @@ void update_players_server() { static void draw_player_bullet_cone(platform_window* window, player* p) { map_info info = get_map_info(window); float bullet_range = 100.0f; - int divisions = 10; + int divisions = 3; float bulletx = p->gunx; float bullety = p->guny; -- cgit v1.2.3-70-g09d2