From 051260d609de7d4b978dc74a023374a3b620a154 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Fri, 5 Sep 2008 17:42:52 +0000
Subject: [PATCH] reduce warnings

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4359 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/portals.qc | 2 --
 data/qcsrc/server/scores.qc  | 3 ---
 data/qcsrc/server/scores.qh  | 2 ++
 data/qcsrc/server/t_items.qc | 1 -
 data/qcsrc/server/t_quake.qc | 3 +++
 data/qcsrc/server/w_porto.qc | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/data/qcsrc/server/portals.qc b/data/qcsrc/server/portals.qc
index 3295b954c..01de7803f 100644
--- a/data/qcsrc/server/portals.qc
+++ b/data/qcsrc/server/portals.qc
@@ -265,8 +265,6 @@ void Portal_Disconnect(entity teleporter, entity destination)
 
 void Portal_Connect(entity teleporter, entity destination)
 {
-	float id;
-
 	teleporter.portal_transform = Portal_Transform_Divide(Portal_Transform_TurnDirection(destination.angles), teleporter.angles);
 
 #ifdef DEBUG
diff --git a/data/qcsrc/server/scores.qc b/data/qcsrc/server/scores.qc
index 6c12fadd7..cc956115f 100644
--- a/data/qcsrc/server/scores.qc
+++ b/data/qcsrc/server/scores.qc
@@ -1,6 +1,3 @@
-.float scores[MAX_SCORE];
-.float teamscores[MAX_TEAMSCORE];
-
 .entity scorekeeper;
 entity teamscorekeepers[16];
 string scores_label[MAX_SCORE];
diff --git a/data/qcsrc/server/scores.qh b/data/qcsrc/server/scores.qh
index eeb8a457c..d6d89eff5 100644
--- a/data/qcsrc/server/scores.qh
+++ b/data/qcsrc/server/scores.qh
@@ -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.
diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 1bdb84e1e..e17ff2f9a 100644
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -217,7 +217,6 @@ float Item_GiveTo(entity item, entity player)
 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))
diff --git a/data/qcsrc/server/t_quake.qc b/data/qcsrc/server/t_quake.qc
index 45a2bd742..8003def56 100644
--- a/data/qcsrc/server/t_quake.qc
+++ b/data/qcsrc/server/t_quake.qc
@@ -53,5 +53,8 @@ void junk_function ()
 	require_spawnfunc_prefix = 1;
 	self.movetypesteplandevent = SUB_Null;
 	self.viewzoom = 0;
+	self.cvar_cl_weaponpriorities = "";
+	self.scores = 0;
+	self.teamscores = 0;
 }
 
diff --git a/data/qcsrc/server/w_porto.qc b/data/qcsrc/server/w_porto.qc
index 00c943d95..038e17e3e 100644
--- a/data/qcsrc/server/w_porto.qc
+++ b/data/qcsrc/server/w_porto.qc
@@ -17,7 +17,7 @@ void W_Porto_Fail (float failhard)
 	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');
-- 
2.39.2