[nexuiz-commits] r6510 - in trunk/data: . qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-04-16 11:11:29 -0400 (Thu, 16 Apr 2009)
New Revision: 6510

Modified:
   trunk/data/effectinfo.txt
   trunk/data/qcsrc/client/particles.qc
Log:
new smoke emitter for DF;
fix bgmvolume 0


Modified: trunk/data/effectinfo.txt
===================================================================
--- trunk/data/effectinfo.txt	2009-04-16 15:10:58 UTC (rev 6509)
+++ trunk/data/effectinfo.txt	2009-04-16 15:11:29 UTC (rev 6510)
@@ -2748,7 +2748,6 @@
 //steam, it needs direction
 // used nowhere in code
 effect steam
-effect steam
 type smoke
 count 2
 tex 0 8
@@ -3192,3 +3191,20 @@
 size 3 3
 stretchfactor 0.6
 velocitymultiplier 0.7
+
+// smoke emitter for small pipes
+// used nowhere in code
+effect smoking_smallemitter
+count 20
+type alphastatic
+tex 0 8
+color 0x292929 0x000000
+size 6 15
+sizeincrease 20
+alpha 200 256 100
+gravity -0.1
+bounce 0
+originjitter 10 10 10
+velocityjitter 5 5 20
+//velocitymultiplier -20
+airfriction -1

Modified: trunk/data/qcsrc/client/particles.qc
===================================================================
--- trunk/data/qcsrc/client/particles.qc	2009-04-16 15:10:58 UTC (rev 6509)
+++ trunk/data/qcsrc/client/particles.qc	2009-04-16 15:11:29 UTC (rev 6510)
@@ -113,7 +113,7 @@
 		return 1;
 	
 	if(cvar("bgmvolume") <= 0)
-		return 0.5;
+		return -1;
 
 	e.just_toggled = FALSE;
 
@@ -160,7 +160,10 @@
 	n = PointparticlesScript(self);
 	if(self.absolute == 2)
 	{
-		n = self.just_toggled ? self.impulse : 0;
+		if(n >= 0)
+			n = self.just_toggled ? self.impulse : 0;
+		else
+			n = self.impulse * drawframetime;
 	}
 	else
 	{