From: FruitieX <fruitiex@gmail.com>
Date: Sun, 12 Dec 2010 09:56:44 +0000 (+0200)
Subject: force g_weapon_stay == 1 in cts, don't show it in the modifications string
X-Git-Tag: xonotic-v0.1.0preview~51^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1344c0077c314df68fb216041a8e042ce33064ab;p=xonotic%2Fxonotic-data.pk3dir.git

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 8f16cbad9..497326c46 100644
--- 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 c690210d8..9cb52c1da 100644
--- 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");