From: Mario <mario@smbclan.net>
Date: Tue, 24 Nov 2015 07:56:43 +0000 (+1000)
Subject: Fix compile
X-Git-Tag: xonotic-v0.8.2~1624
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6e086312bb22dbbf97efd79ed1ce20423d11ed21;p=xonotic%2Fxonotic-data.pk3dir.git

Fix compile
---

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 12a53ff13..459d95020 100644
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -1319,5 +1319,12 @@ MUTATOR_HOOKFUNCTION(nades, BuildMutatorsPrettyString)
 	ret_string = strcat(ret_string, ", Nades");
 	return false;
 }
+
+MUTATOR_HOOKFUNCTION(nades, BuildGameplayTipsString)
+{
+	ret_string = strcat(ret_string, "\n\n^3nades^8 are enabled, press 'g' to use them\n");
+	return false;
+}
+
 #endif
 #endif
diff --git a/qcsrc/server/mutators/mutator/gamemode_race.qc b/qcsrc/server/mutators/mutator/gamemode_race.qc
index 4982a4a8f..5b6788848 100644
--- a/qcsrc/server/mutators/mutator/gamemode_race.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_race.qc
@@ -443,7 +443,7 @@ MUTATOR_HOOKFUNCTION(rc, CheckRules_World)
 	{
 		if(!g_race_qualifying)
 		{
-			ret_float = WinningCondition_QualifyingThenRace(fraglimit);
+			ret_float = WinningCondition_QualifyingThenRace(checkrules_fraglimit);
 			return true;
 		}
 		else if(g_race_qualifying == 2)
diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index deb6032ce..b0f44da6b 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -151,9 +151,6 @@ string getwelcomemessage()
 	if(modifications != "")
 		s = strcat(s, "^8\nactive modifications: ^3", modifications, "^8\n");
 
-	if (cvar("g_nades"))
-		s = strcat(s, "\n\n^3nades^8 are enabled, press 'g' to use them\n");
-
 	if(cache_lastmutatormsg != autocvar_g_mutatormsg)
 	{
 		if(cache_lastmutatormsg)