force g_weapon_stay == 1 in cts, don't show it in the modifications string
authorFruitieX <fruitiex@gmail.com>
Sun, 12 Dec 2010 09:56:44 +0000 (11:56 +0200)
committerFruitieX <fruitiex@gmail.com>
Sun, 12 Dec 2010 09:56:44 +0000 (11:56 +0200)
qcsrc/server/miscfunctions.qc
qcsrc/server/teamplay.qc

index 8f16cba..497326c 100644 (file)
@@ -1306,7 +1306,7 @@ void readlevelcvars(void)
        if (!g_weapon_stay && (cvar("deathmatch") == 2))
                g_weapon_stay = 1;
 
        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");
                g_weapon_stay = 1;
 
        g_ghost_items = cvar("g_ghost_items");
index c690210..9cb52c1 100644 (file)
@@ -525,7 +525,7 @@ void PrintWelcomeMessage(entity pl)
                modifications = strcat(modifications, ", Midair");
        if(g_pinata)
                modifications = strcat(modifications, ", Pinata");
                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");
                modifications = strcat(modifications, ", Weapons stay");
        if(g_bloodloss > 0)
                modifications = strcat(modifications, ", Bloodloss");