From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 12 Jul 2011 14:37:33 +0000 (+0300)
Subject: Code for my last commit
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=139e0015ca218ec3e58497c3606394d88ff30202

Code for my last commit
---

diff --git a/data/qcsrc/server/g_grabber.qc b/data/qcsrc/server/g_grabber.qc
index f8ce6c05..264ce29e 100644
--- a/data/qcsrc/server/g_grabber.qc
+++ b/data/qcsrc/server/g_grabber.qc
@@ -102,10 +102,13 @@ void GrabberThink();
 void Grabber_Stop()
 {
 	pointparticles(particleeffectnum("grabber_impact"), self.origin, '0 0 0', 1);
-	sound (self, CHAN_PROJECTILE, "weapons/grabber_impact.wav", VOL_BASE, ATTN_NORM);
+	if(other.classname == "player")
+		sound (self, CHAN_PROJECTILE, "weapons/grabber_impact_player.wav", VOL_BASE, ATTN_NORM);
+	else
+		sound (self, CHAN_PROJECTILE, "weapons/grabber_impact_world.wav", VOL_BASE, ATTN_NORM);
 
 	self.state = 1;
-	self.think =GrabberThink;
+	self.think = GrabberThink;
 	self.nextthink = time;
 	self.touch = SUB_Null;
 	self.velocity = '0 0 0';
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 0ccaa0ff..3a97b623 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1442,9 +1442,6 @@ void precache()
     // common weapon precaches
     precache_sound ("weapons/weapon_switch.wav");
     precache_sound ("weapons/weaponpickup.wav");
-    precache_sound ("weapons/grabber_fire.wav"); // grabber
-	precache_sound ("weapons/grabber_altfire.wav"); // grabber
-    precache_sound ("weapons/grabber_impact.wav"); // grabber
 
 	float i;
 	for(i = 0; i < 8; i += 1)
diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index dbf470f3..50b6addb 100644
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -47,6 +47,11 @@ void W_Grabber_Attack2()
 	{
 		Damage(trace_ent, self, self, cvar("g_balance_grabber_secondary_damage"), WEP_GRABBER | HITTYPE_SECONDARY, trace_endpos, cvar("g_balance_grabber_secondary_force") * w_shotdir);
 		pointparticles(particleeffectnum("grabber_impact2"), trace_endpos, '0 0 0', 1);
+		if(trace_ent.classname == "player")
+			sound (self, CHAN_PROJECTILE, "weapons/grabber_impact2_player.wav", VOL_BASE, ATTN_NORM);
+		else
+			sound (self, CHAN_PROJECTILE, "weapons/grabber_impact2_world.wav", VOL_BASE, ATTN_NORM);
+
 		W_Grabber_UpdateStats(self, FALSE, TRUE); // the shot is recorded above
 	}
 
@@ -200,7 +205,10 @@ float w_grabber(float req)
 		precache_model ("models/weapons/g_grabber.md3");
 		precache_model ("models/weapons/v_grabber.md3");
 		precache_model ("models/weapons/h_grabber.iqm");
-		precache_sound ("weapons/grabber_impact.wav"); // done by g_grabber.qc
+		precache_sound ("weapons/grabber_impact_player.wav");
+		precache_sound ("weapons/grabber_impact_world.wav");
+		precache_sound ("weapons/grabber_impact2_player.wav");
+		precache_sound ("weapons/grabber_impact2_world.wav");
 		precache_sound ("weapons/grabber_fire.wav");
 		precache_sound ("weapons/grabber_altfire.wav");
 		precache_sound ("weapons/grabber_swing.wav");