r4359 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-05 13:42:52 -0400 (Fri, 05 Sep 2008)
New Revision: 4359

Modified:
   trunk/data/qcsrc/server/portals.qc
   trunk/data/qcsrc/server/scores.qc
   trunk/data/qcsrc/server/scores.qh
   trunk/data/qcsrc/server/t_items.qc
   trunk/data/qcsrc/server/t_quake.qc
   trunk/data/qcsrc/server/w_porto.qc
Log:
reduce warnings


Modified: trunk/data/qcsrc/server/portals.qc
===================================================================
--- trunk/data/qcsrc/server/portals.qc	2008-09-05 17:35:02 UTC (rev 4358)
+++ trunk/data/qcsrc/server/portals.qc	2008-09-05 17:42:52 UTC (rev 4359)
@@ -265,8 +265,6 @@
 
 void Portal_Connect(entity teleporter, entity destination)
 {
-	float id;
-
 	teleporter.portal_transform = Portal_Transform_Divide(Portal_Transform_TurnDirection(destination.angles), teleporter.angles);
 
 #ifdef DEBUG

Modified: trunk/data/qcsrc/server/scores.qc
===================================================================
--- trunk/data/qcsrc/server/scores.qc	2008-09-05 17:35:02 UTC (rev 4358)
+++ trunk/data/qcsrc/server/scores.qc	2008-09-05 17:42:52 UTC (rev 4359)
@@ -1,6 +1,3 @@
-.float scores[MAX_SCORE];
-.float teamscores[MAX_TEAMSCORE];
-
 .entity scorekeeper;
 entity teamscorekeepers[16];
 string scores_label[MAX_SCORE];

Modified: trunk/data/qcsrc/server/scores.qh
===================================================================
--- trunk/data/qcsrc/server/scores.qh	2008-09-05 17:35:02 UTC (rev 4358)
+++ trunk/data/qcsrc/server/scores.qh	2008-09-05 17:42:52 UTC (rev 4359)
@@ -1,4 +1,6 @@
 float scores_initialized; // 1 when scores labels/rules have been set
+.float scores[MAX_SCORE];
+.float teamscores[MAX_TEAMSCORE];
 
 /**
  * Attaches a PlayerScore entity to a player. Use that in ClientConnect.

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2008-09-05 17:35:02 UTC (rev 4358)
+++ trunk/data/qcsrc/server/t_items.qc	2008-09-05 17:42:52 UTC (rev 4359)
@@ -217,7 +217,6 @@
 void Item_Touch (void)
 {
 	entity e, head;
-	float n;
 
 	// remove the item if it's currnetly in a NODROP brush or hits a NOIMPACT surface (such as sky)
 	if (((trace_dpstartcontents | trace_dphitcontents) & DPCONTENTS_NODROP) || (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT))

Modified: trunk/data/qcsrc/server/t_quake.qc
===================================================================
--- trunk/data/qcsrc/server/t_quake.qc	2008-09-05 17:35:02 UTC (rev 4358)
+++ trunk/data/qcsrc/server/t_quake.qc	2008-09-05 17:42:52 UTC (rev 4359)
@@ -53,5 +53,8 @@
 	require_spawnfunc_prefix = 1;
 	self.movetypesteplandevent = SUB_Null;
 	self.viewzoom = 0;
+	self.cvar_cl_weaponpriorities = "";
+	self.scores = 0;
+	self.teamscores = 0;
 }
 

Modified: trunk/data/qcsrc/server/w_porto.qc
===================================================================
--- trunk/data/qcsrc/server/w_porto.qc	2008-09-05 17:35:02 UTC (rev 4358)
+++ trunk/data/qcsrc/server/w_porto.qc	2008-09-05 17:42:52 UTC (rev 4359)
@@ -17,7 +17,7 @@
 	Portal_ClearWithID(self.owner, self.portal_id);
 	self.owner.porto_current = world;
 
-	if(!failhard)
+	if(!failhard && !(self.owner.weapons & WEPBIT_PORTO))
 	{
 		centerprint(self.owner, "^1Portal deployment failed.\n\n^2Catch it to try again!");
 		setsize (self, '-16 -16 0', '16 16 32');