From f2522c04446bb4bd597a8625f9398e67ff957565 Mon Sep 17 00:00:00 2001
From: Aldrik Ramaekers <aldrik@amftech.nl>
Date: Sat, 28 Oct 2023 16:27:07 +0200
Subject: more sounds

---
 src/asset_defs.c |  1 +
 src/audio.c      | 30 ++++++++++++++++++++++++------
 src/bullets.c    |  2 ++
 src/throwables.c |  7 ++++++-
 src/zombies.c    |  1 +
 5 files changed, 34 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/asset_defs.c b/src/asset_defs.c
index 86832d4..a83ad96 100644
--- a/src/asset_defs.c
+++ b/src/asset_defs.c
@@ -41,4 +41,5 @@ void load_assets() {
 	wav_reload_mp5 = Mix_LoadWAV("data/sounds/reload_mp5.wav");
 	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");
 }
\ No newline at end of file
diff --git a/src/audio.c b/src/audio.c
index 0c53538..b174610 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -1,10 +1,19 @@
 #include "../include/audio.h"
 
+void add_zombie_audio_event_to_queue(audio_event_type event, zombie_type zombie, u32 playerid, vec3f position) {
+	for (int i = 0; i < max_audio_events; i++) {
+		if (audio_events[i].active) continue;
+
+		audio_events[i] = (audio_event){.active = true, .obj = OBJECT_NONE, .zombie = zombie, .playerid = playerid, .position = position, .type = event};
+		return;
+	}
+}
+
 void add_object_audio_event_to_queue(audio_event_type event, object_type obj, u32 playerid, vec3f position) {
 	for (int i = 0; i < max_audio_events; i++) {
 		if (audio_events[i].active) continue;
 
-		audio_events[i] = (audio_event){.active = true, .obj = obj, .playerid = playerid, .position = position, .type = event};
+		audio_events[i] = (audio_event){.active = true, .obj = obj, .zombie = ZOMBIE_TYPE_NONE, .playerid = playerid, .position = position, .type = event};
 		return;
 	}
 }
@@ -35,7 +44,7 @@ static Mix_Chunk* get_sample_from_audio_event(audio_event event, u32 playerid) {
 		case EVENT_SHOOT: {
 			switch (p->guntype)
 			{
-				case GUN_MP5: return wav_shoot_mp5;		
+				case GUN_MP5: return wav_shoot_mp5;
 				default: return wav_error;
 			}
 		}
@@ -48,10 +57,19 @@ static Mix_Chunk* get_sample_from_audio_event(audio_event event, u32 playerid) {
 		}
 
 		case EVENT_IMPACT: {
-			switch (event.obj)
-			{
-				case OBJECT_PLANTBOX1: return wav_impact_wood;		
-				default: return wav_error;
+			if (event.zombie != ZOMBIE_TYPE_NONE) {
+				switch (event.zombie)
+				{
+					case ZOMBIE_TYPE_NORMAL: return wav_impact_zombie;
+					default: return wav_error;
+				}
+			}
+			else {
+				switch (event.obj)
+				{
+					case OBJECT_PLANTBOX1: return wav_impact_wood;		
+					default: return wav_error;
+				}
 			}
 		}
 
diff --git a/src/bullets.c b/src/bullets.c
index 728326e..f7f033d 100644
--- a/src/bullets.c
+++ b/src/bullets.c
@@ -248,6 +248,8 @@ void update_bullets_server(platform_window* window) {
 			bullets[i].endx = b.endx;
 			bullets[i].damage = b.damage;
 			b = bullets[i];
+
+			add_zombie_audio_event_to_queue(EVENT_IMPACT, ZOMBIE_TYPE_NORMAL, p->id, (vec3f){.x = p->playerx, .y = p->playery, .z = p->height});
 		}
 	}
 }
diff --git a/src/throwables.c b/src/throwables.c
index 1d04565..630dccb 100644
--- a/src/throwables.c
+++ b/src/throwables.c
@@ -121,6 +121,11 @@ void draw_throwables(platform_window* window) {
 		float throwable_render_x = t.position.x*info.tile_width + (t.position.y*info.px_incline);
 		float throwable_render_y = t.position.y*info.tile_height - (t.position.z*info.px_raised_per_h);
 
-		renderer->render_image(img_grenade, throwable_render_x, throwable_render_y, 10, 10);
+		box full_box = get_render_box_of_square(window, t.position, (vec3f){0.2, 0.2, 0.2});
+		renderer->render_image(img_grenade, full_box.tl_u.x, full_box.tl_u.y, 
+			full_box.br_d.x - full_box.tl_d.x, full_box.br_d.y - full_box.tr_u.y);
+
+		
+		//renderer->render_image(img_grenade, throwable_render_x, throwable_render_y, 10, 10);
 	}
 }
\ No newline at end of file
diff --git a/src/zombies.c b/src/zombies.c
index c72e04b..4c1225a 100644
--- a/src/zombies.c
+++ b/src/zombies.c
@@ -46,6 +46,7 @@ void spawn_zombie(int x, int y) {
 		zombies[i].path = array_create(sizeof(vec2f));
 		zombies[i].next_path = array_create(sizeof(vec2f));
 		zombies[i].alive = true;
+		zombies[i].type = ZOMBIE_TYPE_NORMAL;
 		zombies[i].health = 100.0f;
 		zombies[i].position = (vec3f){x,y, 0};
 		zombies[i].size = (vec3f){0.4, 0.4, 1};
-- 
cgit v1.2.3-70-g09d2