From ee96f6743443e2d3e8cd0e244969899754b5daa0 Mon Sep 17 00:00:00 2001 From: Jakob MG Date: Tue, 28 Jun 2011 22:45:38 +0200 Subject: [PATCH] Impact sounds for vehciles (using placeholders) --- qcsrc/server/cl_client.qc | 2 +- qcsrc/server/vehicles/vehicles.qc | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 68a7831d6..82ff65c39 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -3135,7 +3135,7 @@ void PlayerPostThink (void) } else if (self.classname == "spectator") { //do nothing } - + /* float i; for(i = 0; i < 1000; ++i) diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc index 751023014..578563595 100644 --- a/qcsrc/server/vehicles/vehicles.qc +++ b/qcsrc/server/vehicles/vehicles.qc @@ -703,7 +703,6 @@ void vehicles_damage(entity inflictor, entity attacker, float damage, float deat self.vehicle_shieldent.think = shieldhit_think; } - self.vehicle_shieldent.colormod = '1 1 1'; self.vehicle_shieldent.alpha = 0.45; self.vehicle_shieldent.angles = vectoangles(normalize(hitloc - (self.origin + self.vehicle_shieldent.origin))) - self.angles; @@ -713,15 +712,27 @@ void vehicles_damage(entity inflictor, entity attacker, float damage, float deat if(self.vehicle_shield < 0) { + self.vehicle_health -= fabs(self.vehicle_shield); self.vehicle_shieldent.colormod = '2 0 0'; self.vehicle_shield = 0; self.vehicle_shieldent.alpha = 0.75; - self.vehicle_health -= fabs(self.vehicle_shield); + + if(sound_allowed(MSG_BROADCAST, attacker)) + spamsound (self, CHAN_PROJECTILE, "onslaught/ons_hit2.wav", VOL_BASE, ATTN_NORM); // FIXME: PLACEHOLDER } + else + if(sound_allowed(MSG_BROADCAST, attacker)) + spamsound (self, CHAN_PROJECTILE, "onslaught/electricity_explode.wav", VOL_BASE, ATTN_NORM); // FIXME: PLACEHOLDER + } else + { self.vehicle_health -= damage; + if(sound_allowed(MSG_BROADCAST, attacker)) + spamsound (self, CHAN_PROJECTILE, "onslaught/ons_hit2.wav", VOL_BASE, ATTN_NORM); // FIXME: PLACEHOLDER + } + self.velocity += force; // * (vlen(force) / self.mass); if(self.vehicle_health <= 0) -- 2.39.2