r2435 - branches/nexuiz-2.0/data/qcsrc/server trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: esteel
Date: 2007-05-01 16:48:29 -0400 (Tue, 01 May 2007)
New Revision: 2435

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/t_plats.qc
   trunk/data/qcsrc/server/t_plats.qc
Log:
func_bob can also damage players now if dmg/dmgtime is set


Modified: branches/nexuiz-2.0/data/qcsrc/server/t_plats.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_plats.qc	2007-05-01 08:29:34 UTC (rev 2434)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_plats.qc	2007-05-01 20:48:29 UTC (rev 2435)
@@ -463,12 +463,20 @@
 	self.owner.velocity = (v - self.owner.origin) * 10;
 };
 
+void() bobbing_blocked =
+{
+	// no need to duplicate code
+	rotating_blocked();
+}
+
 /*QUAKED func_bobbing (0 .5 .8) ? X_AXIS Y_AXIS
 Brush model that moves back and forth on one axis (default Z).
 speed : how long one cycle takes in seconds (default 4)
 height : how far the cycle moves (default 32)
 phase : cycle timing adjustment (0-1 as a fraction of the cycle, default 0)
 noise : path/name of looping .wav file to play.
+dmg : Do this mutch dmg every .dmgtime intervall when blocked
+dmgtime : See above.
 */
 void() func_bobbing =
 {
@@ -486,6 +494,15 @@
 	self.destvec = self.origin;
 	// time scale to get degrees
 	self.cnt = 360 / self.speed;
+
+	// damage when blocked
+	self.blocked = bobbing_blocked;
+	if(self.dmg & (!self.message))
+		self.message = " was in the wrong place.";
+	if(self.dmg && (!self.dmgtime))
+		self.dmgtime = 0.25;
+	self.dmgtime2 = time;
+
 	// how far to bob
 	if (self.spawnflags & 1) // X
 		self.movedir = '1 0 0' * self.height;

Modified: trunk/data/qcsrc/server/t_plats.qc
===================================================================
--- trunk/data/qcsrc/server/t_plats.qc	2007-05-01 08:29:34 UTC (rev 2434)
+++ trunk/data/qcsrc/server/t_plats.qc	2007-05-01 20:48:29 UTC (rev 2435)
@@ -463,12 +463,20 @@
 	self.owner.velocity = (v - self.owner.origin) * 10;
 };
 
+void() bobbing_blocked =
+{
+	// no need to duplicate code
+	rotating_blocked();
+}
+
 /*QUAKED func_bobbing (0 .5 .8) ? X_AXIS Y_AXIS
 Brush model that moves back and forth on one axis (default Z).
 speed : how long one cycle takes in seconds (default 4)
 height : how far the cycle moves (default 32)
 phase : cycle timing adjustment (0-1 as a fraction of the cycle, default 0)
 noise : path/name of looping .wav file to play.
+dmg : Do this mutch dmg every .dmgtime intervall when blocked
+dmgtime : See above.
 */
 void() func_bobbing =
 {
@@ -486,6 +494,15 @@
 	self.destvec = self.origin;
 	// time scale to get degrees
 	self.cnt = 360 / self.speed;
+
+	// damage when blocked
+	self.blocked = bobbing_blocked;
+	if(self.dmg & (!self.message))
+		self.message = " was in the wrong place.";
+	if(self.dmg && (!self.dmgtime))
+		self.dmgtime = 0.25;
+	self.dmgtime2 = time;
+
 	// how far to bob
 	if (self.spawnflags & 1) // X
 		self.movedir = '1 0 0' * self.height;