[nexuiz-commits] r7515 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-08-25 03:22:16 -0400 (Tue, 25 Aug 2009)
New Revision: 7515

Modified:
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/mode_onslaught.qc
Log:
remove stupid prints and unused function


Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-08-25 06:55:33 UTC (rev 7514)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-08-25 07:22:16 UTC (rev 7515)
@@ -2485,8 +2485,6 @@
 		self.alpha = 1 - (time - self.fade_time) * self.fade_rate;
 	}
 
-	print(ftos(time), " ", ftos(self.alpha), "\n");
-
 	if(self.alpha < 0.003)
 	{
 		remove(self);
@@ -2495,8 +2493,6 @@
 
 	self.scale = (time - self.teleport_time) / (self.fade_time + 1 / self.fade_rate - self.teleport_time) * self.count;
 
-	print(ftos(self.scale), "\n");
-
 	self.frame = self.count;
 };
 
@@ -2515,7 +2511,9 @@
 	e.fade_time = time + t1;
 	e.fade_rate = 1/t2;
 	e.teleport_time = time;
-	e.count = bound(0, sz / max6(-e.mins_x, -e.mins_y, -e.mins_z, e.maxs_x, e.maxs_y, e.maxs_z), 16);
-	print(vtos(e.mins), " ", vtos(e.maxs), "\n");
+	if(sz >= 0)
+		e.count = bound(0, sz / max6(-e.mins_x, -e.mins_y, -e.mins_z, e.maxs_x, e.maxs_y, e.maxs_z), 16);
+	else
+		e.count = -sz;
 	setsize(e, e.mins * sz, e.maxs * sz);
 }

Modified: trunk/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- trunk/data/qcsrc/server/mode_onslaught.qc	2009-08-25 06:55:33 UTC (rev 7514)
+++ trunk/data/qcsrc/server/mode_onslaught.qc	2009-08-25 07:22:16 UTC (rev 7515)
@@ -461,30 +461,9 @@
 	e.nextthink = time + 0.05;
 };
 
-void onslaught_generator_shockwave_think()
-{
-	self.nextthink = time + 0.05;
-	if(self.count > 25)
-	{
-		self.think = SUB_Remove;
-		return;
-	}
-
-	if(self.count > 15)
-		self.alpha -= 0.1;
-	else
-		self.alpha = 1;
-
-	self.scale = self.count * 4;
-	setsize(self, self.mins * self.scale, self.maxs * self.scale);
-	self.frame = self.count;
-
-	self.count +=1;
-};
-
 void onslaught_generator_shockwave_spawn(vector org)
 {
-	shockwave_spawn("models/onslaught/shockwave.md3", org, 5120, 0.75, 0.5);
+	shockwave_spawn("models/onslaught/shockwave.md3", org, -64, 0.75, 0.5);
 };
 
 void onslaught_generator_damage_think()