diff options
| -rw-r--r-- | build/data/sounds/collect.wav | bin | 0 -> 34566 bytes | |||
| -rw-r--r-- | build/zombies.exe | bin | 1989107 -> 1989137 bytes | |||
| -rw-r--r-- | data/sounds/collect.wav | bin | 0 -> 34566 bytes | |||
| -rw-r--r-- | include/asset_defs.h | 1 | ||||
| -rw-r--r-- | include/audio.h | 1 | ||||
| -rw-r--r-- | src/asset_defs.c | 1 | ||||
| -rw-r--r-- | src/audio.c | 1 | ||||
| -rw-r--r-- | src/bullets.c | 2 | ||||
| -rw-r--r-- | src/drops.c | 2 | ||||
| -rw-r--r-- | src/map.c | 2 | ||||
| -rw-r--r-- | src/players.c | 6 | ||||
| -rw-r--r-- | src/throwables.c | 2 |
12 files changed, 12 insertions, 6 deletions
diff --git a/build/data/sounds/collect.wav b/build/data/sounds/collect.wav Binary files differnew file mode 100644 index 0000000..67ba773 --- /dev/null +++ b/build/data/sounds/collect.wav diff --git a/build/zombies.exe b/build/zombies.exe Binary files differindex d39bb4d..ea5f8fd 100644 --- a/build/zombies.exe +++ b/build/zombies.exe diff --git a/data/sounds/collect.wav b/data/sounds/collect.wav Binary files differnew file mode 100644 index 0000000..67ba773 --- /dev/null +++ b/data/sounds/collect.wav diff --git a/include/asset_defs.h b/include/asset_defs.h index a25da7c..78a73ca 100644 --- a/include/asset_defs.h +++ b/include/asset_defs.h @@ -51,6 +51,7 @@ Mix_Chunk* wav_reload_nova; Mix_Chunk* wav_impact_zombie; Mix_Chunk* wav_impact_wood; Mix_Chunk* wav_error; +Mix_Chunk* wav_collect; void load_assets(); diff --git a/include/audio.h b/include/audio.h index de76af8..4354e6e 100644 --- a/include/audio.h +++ b/include/audio.h @@ -18,6 +18,7 @@ typedef enum t_audio_event_type { EVENT_BOUNCE_THROWABLE, EVENT_EXPLODE_THROWABLE, EVENT_IMPACT, + EVENT_COLLECT, } audio_event_type; typedef struct t_audio_event { diff --git a/src/asset_defs.c b/src/asset_defs.c index 837a8ce..92a03f1 100644 --- a/src/asset_defs.c +++ b/src/asset_defs.c @@ -46,4 +46,5 @@ void load_assets() { wav_impact_wood = Mix_LoadWAV("data/sounds/impact_wood.wav"); wav_error = Mix_LoadWAV("data/sounds/error.wav"); wav_impact_zombie = Mix_LoadWAV("data/sounds/impact_zombie.wav"); + wav_collect = Mix_LoadWAV("data/sounds/collect.wav"); }
\ No newline at end of file diff --git a/src/audio.c b/src/audio.c index 1c2dbc5..db424f3 100644 --- a/src/audio.c +++ b/src/audio.c @@ -50,6 +50,7 @@ static Mix_Chunk* get_sample_from_audio_event(audio_event event, u32 playerid) { switch (event.type) { + case EVENT_COLLECT: return wav_collect; case EVENT_BOUNCE_THROWABLE: return wav_throwable_bounce; case EVENT_EXPLODE_THROWABLE: { switch(event.throwable) { diff --git a/src/bullets.c b/src/bullets.c index 9441ead..a3a876e 100644 --- a/src/bullets.c +++ b/src/bullets.c @@ -263,6 +263,6 @@ void draw_bullets(platform_window* window) { float bullet_render_x_end = b.endx*info.tile_width + (b.endy*info.px_incline); float bullet_render_y_end = b.endy*info.tile_height - (b.position.z*info.px_raised_per_h); - renderer->render_line(bullet_render_x, bullet_render_y, bullet_render_x_end, bullet_render_y_end, 5, rgb(255, 51, 51)); + renderer->render_line(bullet_render_x, bullet_render_y, bullet_render_x_end, bullet_render_y_end, 1, rgba(255, 221, 97, 100)); } }
\ No newline at end of file diff --git a/src/drops.c b/src/drops.c index 9c4b48c..b97b8be 100644 --- a/src/drops.c +++ b/src/drops.c @@ -29,6 +29,8 @@ void update_drops_server() { if (check_if_player_collided_with_box(*p, get_box_of_square(drops[i].position, drops[i].size))) { handle_drop_pickup(p, &drops[i]); + + add_audio_event_to_queue(EVENT_COLLECT, p->id, (vec3f){.x = p->playerx, .y = p->playery, .z = p->height}); } } @@ -397,7 +397,7 @@ inline map_info get_map_info(platform_window* window) { map_info info; info.tile_width = get_tile_width(window); info.tile_height = get_tile_height(window); - info.px_incline = info.tile_width/3; // info.tile_width/3; // offset*info.tile_width; + info.px_incline = 0.0f; //info.tile_width/3; // info.tile_width/3; // offset*info.tile_width; info.px_raised_per_h = info.tile_height/2.5; return info; }
\ No newline at end of file diff --git a/src/players.c b/src/players.c index ac34778..d7074a2 100644 --- a/src/players.c +++ b/src/players.c @@ -311,10 +311,10 @@ void draw_players(platform_window* window) { float player_render_y = players[i].playery*info.tile_height - (height*info.px_raised_per_h); players[i].gun_height = height+0.5; - float gun_render_x = players[i].gunx*info.tile_width + (players[i].guny*info.px_incline); - float gun_render_y = players[i].guny*info.tile_height - (players[i].gun_height*info.px_raised_per_h); + //float gun_render_x = players[i].gunx*info.tile_width + (players[i].guny*info.px_incline); + //float gun_render_y = players[i].guny*info.tile_height - (players[i].gun_height*info.px_raised_per_h); - renderer->render_rectangle(gun_render_x, gun_render_y, size/4, size/4, rgb(20,255,20)); + //renderer->render_rectangle(gun_render_x, gun_render_y, size/4, size/4, rgb(20,255,20)); if (players[i].id == player_id) { _next_camera_pos.x = -(window->width / 2) + player_render_x; diff --git a/src/throwables.c b/src/throwables.c index 2e7d957..cd8f8af 100644 --- a/src/throwables.c +++ b/src/throwables.c @@ -10,7 +10,7 @@ void throw_throwable(platform_window* window, u32 id, throwable_type type, float log_info("User with unknown id throwing stuff"); } - throwable t = {.active = true, .state = THROWABLE_FLYING, .alive_time = 0.0f, .type = type, .direction = (vec3f){.x = dirx, .y = diry, .z = -0.2f}, + throwable t = {.active = true, .state = THROWABLE_FLYING, .alive_time = 0.0f, .type = type, .direction = (vec3f){.x = dirx*1.5f, .y = diry*1.5f, .z = -0.2f}, .player_id = id, .position = (vec3f){.x = p->playerx, .y = p->playery, .z = p->height}}; t.sprite = create_sprite(img_grenade_explode, 12, 96, 96, 0.1f); |