From 5b07ee41a92ffabce1f0d0d159142e3b6e029bf5 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sat, 27 Mar 2021 09:09:10 +0100 Subject: [PATCH] Add damage_bullet sound shader definitions. Those are played when a bullet successfully hits a hurtable body. --- platform/base_scripts.pk3dir/sound/damage_bullet.sndshd | 5 +++++ src/server/entry.qc | 1 + src/server/traceattack.qc | 1 + src/shared/fteextensions.qc | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 platform/base_scripts.pk3dir/sound/damage_bullet.sndshd diff --git a/platform/base_scripts.pk3dir/sound/damage_bullet.sndshd b/platform/base_scripts.pk3dir/sound/damage_bullet.sndshd new file mode 100644 index 00000000..19c58f10 --- /dev/null +++ b/platform/base_scripts.pk3dir/sound/damage_bullet.sndshd @@ -0,0 +1,5 @@ +damage_bullet.hit +{ + sample weapons/bullet_hit1.wav + sample weapons/bullet_hit2.wav +} diff --git a/src/server/entry.qc b/src/server/entry.qc index 6c25b2f1..eba76cf7 100644 --- a/src/server/entry.qc +++ b/src/server/entry.qc @@ -485,6 +485,7 @@ initents(void) Sound_Precache("player.gaspheavy"); Sound_Precache("player.waterenter"); Sound_Precache("player.waterexit"); + Sound_Precache("damage_bullet.hit"); Game_InitRules(); Game_Worldspawn(); diff --git a/src/server/traceattack.qc b/src/server/traceattack.qc index a567270c..c17c714c 100644 --- a/src/server/traceattack.qc +++ b/src/server/traceattack.qc @@ -58,6 +58,7 @@ TraceAttack_FireSingle(vector vecPos, vector vAngle, int iDamage, int iWeapon) iDamage *= 3; #endif Damage_Apply(trace_ent, self, iDamage, iWeapon, DMG_BULLET); + Sound_Play(trace_ent, CHAN_BODY, "damage_bullet.hit"); } if (trace_ent.iBleeds == TRUE) { diff --git a/src/shared/fteextensions.qc b/src/shared/fteextensions.qc index 506adf8a..282ee682 100644 --- a/src/shared/fteextensions.qc +++ b/src/shared/fteextensions.qc @@ -1509,7 +1509,7 @@ void(entity e, vector min, vector max) setsize = #4; /* Sets the e's mins and maxs fields. Also relinks collision state, which sets absmin and absmax too. */ #endif -#ifdef SSQC +#if defined(CSQC) || defined(SSQC) void() breakpoint = #6; /* Trigger a debugging event. FTE will break into the qc debugger. Other engines may crash with a debug execption. */