[nexuiz-commits] r7316 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-08-04 05:09:49 -0400 (Tue, 04 Aug 2009)
New Revision: 7316

Modified:
   trunk/data/qcsrc/client/gibs.qc
Log:
do not honor cl_nogibs in cl_gentle (allows the menu to make more sense)


Modified: trunk/data/qcsrc/client/gibs.qc
===================================================================
--- trunk/data/qcsrc/client/gibs.qc	2009-08-04 07:10:55 UTC (rev 7315)
+++ trunk/data/qcsrc/client/gibs.qc	2009-08-04 09:09:49 UTC (rev 7316)
@@ -126,7 +126,7 @@
 	float issilent;
 	string gentle_prefix;
 
-	float c, gibfactor, randomvalue;
+	float c, randomvalue;
 
 	type = ReadByte(); // gibbage type
 	amount = ReadByte() / 16.0; // gibbage amount
@@ -146,15 +146,15 @@
 			gentle_prefix = "morphed_";
 	}
 
-	gibfactor = 1 - cvar("cl_nogibs");
-	if(gibfactor <= 0)
-		return;
+	if(cvar("cl_gentle"))
+		amount *= 1 - cvar("cl_nogibs");
 
-	amount *= gibfactor;
-
 	if(cvar("ekg"))
 		amount *= 5;
 
+	if(amount <= 0)
+		return;
+
 	self.origin = org; // for the sounds
 
 	specnum = (type & 0x78) / 8; // blood/gibmodel type: using four bits (0..7, bit indexes 3,4,5)