From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 25 Sep 2014 16:25:58 +0000 (+0200)
Subject: Fix compile.
X-Git-Tag: xonotic-v0.8.0~152^2~25^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7a9f1a27f889cb7fa9325f2daefe8a8abb4e9edd;p=xonotic%2Fxonotic-data.pk3dir.git

Fix compile.
---

diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc
index 1abf39e4f..4b00f1290 100644
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@ -603,20 +603,6 @@ float getplayeralpha(float pl)
 	return 1;
 }
 
-vector getcsqcplayercolor(float pl)
-{
-	entity e;
-
-	e = CSQCModel_server2csqc(pl);
-	if(e)
-	{
-		if(e.colormap > 0)
-			return colormapPaletteColor(((e.colormap >= 1024) ? e.colormap : stof(getplayerkeyvalue(e.colormap - 1, "colors"))) & 0x0F, TRUE);
-	}
-
-	return '1 1 1';
-}
-
 float getplayerisdead(float pl)
 {
 	entity e;
diff --git a/qcsrc/server/mutators/gamemode_nexball.qc b/qcsrc/server/mutators/gamemode_nexball.qc
index bcd880b69..176fb1eac 100644
--- a/qcsrc/server/mutators/gamemode_nexball.qc
+++ b/qcsrc/server/mutators/gamemode_nexball.qc
@@ -976,7 +976,7 @@ MUTATOR_HOOKFUNCTION(nexball_SetStartItems)
 
 MUTATOR_HOOKFUNCTION(nexball_ForbidThrowing)
 {
-	if(self.weapon == WEP_GRENADE_LAUNCHER)
+	if(self.weapon == WEP_MORTAR)
 		return TRUE;
 
 	return FALSE;
@@ -985,7 +985,7 @@ MUTATOR_HOOKFUNCTION(nexball_ForbidThrowing)
 MUTATOR_HOOKFUNCTION(nexball_FilterItem)
 {
 	if(self.classname == "droppedweapon")
-	if(self.weapon == WEP_GRENADE_LAUNCHER)
+	if(self.weapon == WEP_MORTAR)
 		return TRUE;
 
 	return FALSE;
@@ -1011,7 +1011,7 @@ MUTATOR_DEFINITION(gamemode_nexball)
 		g_nexball_meter_period = rint(g_nexball_meter_period * 32) / 32; //Round to 1/32ths to send as a byte multiplied by 32
 		addstat(STAT_NB_METERSTART, AS_FLOAT, metertime);
 
-		w_porto(WR_PRECACHE); // abuse
+		W_Porto(WR_INIT); // abuse
 
 		// General settings
 		/*