[nexuiz-commits] r7192 - in trunk/data/qcsrc: client server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Jul 11 11:27:00 EDT 2009


Author: div0
Date: 2009-07-11 11:27:00 -0400 (Sat, 11 Jul 2009)
New Revision: 7192

Modified:
   trunk/data/qcsrc/client/Main.qc
   trunk/data/qcsrc/server/race.qc
Log:
more penalty time fixes


Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc	2009-07-11 14:59:28 UTC (rev 7191)
+++ trunk/data/qcsrc/client/Main.qc	2009-07-11 15:27:00 UTC (rev 7192)
@@ -920,7 +920,6 @@
 
 			if(race_checkpoint == 0 || race_checkpoint == 254)
 			{
-				race_penaltytime = 0;
 				race_penaltyaccumulator = 0;
 				race_laptime = time; // valid
 			}

Modified: trunk/data/qcsrc/server/race.qc
===================================================================
--- trunk/data/qcsrc/server/race.qc	2009-07-11 14:59:28 UTC (rev 7191)
+++ trunk/data/qcsrc/server/race.qc	2009-07-11 15:27:00 UTC (rev 7192)
@@ -363,6 +363,18 @@
 
 	if(other.race_checkpoint == -1 || other.race_checkpoint == self.race_checkpoint)
 	{
+		if(self.race_penalty)
+		{
+			if(other.race_lastpenalty != self)
+			{
+				other.race_lastpenalty = self;
+				race_ImposePenaltyTime(other, self.race_penalty, self.race_penalty_reason);
+			}
+		}
+
+		if(other.race_penalty)
+			return;
+
 		/*
 		 * Trigger targets
 		 */
@@ -375,8 +387,6 @@
 			self.message = oldmsg;
 		}
 
-		race_ImposePenaltyTime(other, self.race_penalty, self.race_penalty_reason);
-
 		other.race_checkpoint = race_NextCheckpoint(self.race_checkpoint);
 
 		race_SendTime(other, self.race_checkpoint, time - other.race_laptime, !!other.race_laptime);



More information about the nexuiz-commits mailing list