force g_weapon_stay == 1 in cts, don't show it in the modifications string

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 8f16cbad9d29d7a448e771c01c34c3926d6329ae..497326c46be149fd6e064aeeb555b5fffb9ddf5b 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -1306,7 +1306,7 @@ void readlevelcvars(void)
        if (!g_weapon_stay && (cvar("deathmatch") == 2))
                g_weapon_stay = 1;
 
-       if (!g_weapon_stay && g_cts)
+       if (g_cts)
                g_weapon_stay = 1;
 
        g_ghost_items = cvar("g_ghost_items");

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index c690210d8359cf782ed01680ffba3e661d17070f..9cb52c1daa2444053ea8e6fbe2d344127f4197ad 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -525,7 +525,7 @@ void PrintWelcomeMessage(entity pl)
                modifications = strcat(modifications, ", Midair");
        if(g_pinata)
                modifications = strcat(modifications, ", Pinata");
-       if(g_weapon_stay)
+       if(g_weapon_stay && !g_cts)
                modifications = strcat(modifications, ", Weapons stay");
        if(g_bloodloss > 0)
                modifications = strcat(modifications, ", Bloodloss");