]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Don't show the blaster weaponstart message in a weapon arena mode
authorMario <zacjardine@y7mail.com>
Sun, 30 Aug 2015 13:28:58 +0000 (23:28 +1000)
committerMario <zacjardine@y7mail.com>
Sun, 30 Aug 2015 13:29:49 +0000 (23:29 +1000)
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
qcsrc/server/teamplay.qc

index a1b299d9fc1f3cd674cdfd55eb941c08e164deea..ec77c8c4191bdae4ad41733fd2ba9ea17189d4e3 100644 (file)
@@ -82,7 +82,7 @@ string XonoticMutatorsDialog_toString(entity me)
                s = strcat(s, ", ", _("Invincible Projectiles"));
        if(cvar_string("g_weaponarena") != "0")
                s = strcat(s, ", ", WeaponArenaString());
-       if(cvar("g_balance_blaster_weaponstart") == 0)
+       else if(cvar("g_balance_blaster_weaponstart") == 0)
                s = strcat(s, ", ", _("No start weapons"));
        if(cvar("sv_gravity") < stof(cvar_defstring("sv_gravity")))
                s = strcat(s, ", ", _("Low gravity"));
index c7703e2e5d5cda237828710df111134bbabad7dc..3621f7214e5611afcdc9d1bb76f6804041170e69 100644 (file)
@@ -297,7 +297,7 @@ string getwelcomemessage(void)
                else
                        modifications = strcat(modifications, ", ", g_weaponarena_list, " Arena");
        }
-       if(cvar("g_balance_blaster_weaponstart") == 0)
+       else if(cvar("g_balance_blaster_weaponstart") == 0)
                modifications = strcat(modifications, ", No start weapons");
        if(cvar("sv_gravity") < stof(cvar_defstring("sv_gravity")))
                modifications = strcat(modifications, ", Low gravity");