r4418 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-08 14:08:53 -0400 (Mon, 08 Sep 2008)
New Revision: 4418

Modified:
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/race.qc
   trunk/data/qcsrc/server/sv_main.qc
   trunk/data/qcsrc/server/w_porto.qc
Log:
check if the player touches a checkpoint, and ignore portal shooting while in one


Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2008-09-08 17:51:33 UTC (rev 4417)
+++ trunk/data/qcsrc/server/defs.qh	2008-09-08 18:08:53 UTC (rev 4418)
@@ -489,3 +489,5 @@
 .float stat_sys_ticrate;
 .float phase;
 .float weapons;
+
+.float porto_forbidden;

Modified: trunk/data/qcsrc/server/race.qc
===================================================================
--- trunk/data/qcsrc/server/race.qc	2008-09-08 17:51:33 UTC (rev 4417)
+++ trunk/data/qcsrc/server/race.qc	2008-09-08 18:08:53 UTC (rev 4418)
@@ -344,6 +344,8 @@
 		self = oldself;
 	}
 
+	other.porto_forbidden = 2; // decreased by 1 each StartFrame
+
 	if(other.race_checkpoint == -1 || other.race_checkpoint == self.race_checkpoint)
 	{
 		/*

Modified: trunk/data/qcsrc/server/sv_main.qc
===================================================================
--- trunk/data/qcsrc/server/sv_main.qc	2008-09-08 17:51:33 UTC (rev 4417)
+++ trunk/data/qcsrc/server/sv_main.qc	2008-09-08 18:08:53 UTC (rev 4418)
@@ -177,4 +177,7 @@
 		self = RandomSelection_chosen_ent;
 		SelectSpawnPoint(0);
 	}
+
+	FOR_EACH_PLAYER(self)
+		self.porto_forbidden = max(0, self.porto_forbidden - 1);
 }

Modified: trunk/data/qcsrc/server/w_porto.qc
===================================================================
--- trunk/data/qcsrc/server/w_porto.qc	2008-09-08 17:51:33 UTC (rev 4417)
+++ trunk/data/qcsrc/server/w_porto.qc	2008-09-08 18:08:53 UTC (rev 4418)
@@ -212,6 +212,7 @@
 
 		if (self.BUTTON_ATCK)
 		if (!self.porto_current)
+		if (!self.porto_forbidden)
 		if (weapon_prepareattack(0, cvar("g_balance_porto_primary_refire")))
 		{
 			W_Porto_Attack();