r5588 - in trunk/data/qcsrc: client server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-17 12:56:34 -0500 (Sat, 17 Jan 2009)
New Revision: 5588

Modified:
   trunk/data/qcsrc/client/gibs.qc
   trunk/data/qcsrc/server/g_violence.qc
Log:
transmit the sv_gentle state from server to client. SavageX: you know what to do in gibs.qc :)


Modified: trunk/data/qcsrc/client/gibs.qc
===================================================================
--- trunk/data/qcsrc/client/gibs.qc	2009-01-17 17:53:48 UTC (rev 5587)
+++ trunk/data/qcsrc/client/gibs.qc	2009-01-17 17:56:34 UTC (rev 5588)
@@ -57,7 +57,7 @@
 
 void Ent_GibSplash()
 {
-	float amount, type;
+	float amount, type, isgentle;
 	vector org, vel, mi, ma;
 
 	float c, gibfactor, randomvalue;
@@ -71,6 +71,10 @@
 	mi = decompressShortVector(ReadShort());
 	ma = decompressShortVector(ReadShort());
 
+	isgentle = (type & 0x8000 || cvar("cl_gentle"))
+	type = type & 0x7FFF;
+
+
 	gibfactor = 1 - cvar("cl_nogibs");
 	if(gibfactor <= 0)
 		return;

Modified: trunk/data/qcsrc/server/g_violence.qc
===================================================================
--- trunk/data/qcsrc/server/g_violence.qc	2009-01-17 17:53:48 UTC (rev 5587)
+++ trunk/data/qcsrc/server/g_violence.qc	2009-01-17 17:56:34 UTC (rev 5588)
@@ -21,6 +21,8 @@
 	e.classname = "gibsplash";
 	e.cnt = amount;
 	e.state = type;
+	if(sv_gentle)
+		e.state |= 0x8000; // "force gentle" bit
 	e.SendEntity = Violence_GibSplash_SendEntity;
 	e.nextthink = time + 0.2;
 	e.think = SUB_Remove;