Fix compile

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 12a53ff1392bef5bffb9e2efb89f1a60541b7573..459d95020308e36159cc271b45c2d20572d744eb 100644 (file)
--- 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 4982a4a8f6a3bdffb635f25387b0ea7d3ba374de..5b67888485d450dd4a8bdde5f5495cd746188f52 100644 (file)
--- 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 deb6032ce207a32b980a06804608cbd4303ad173..b0f44da6b7e51d5104d3d01b1571b3c149bc874c 100644 (file)
--- 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)