From: Mario <zacjardine@y7mail.com>
Date: Sun, 30 Aug 2015 13:28:58 +0000 (+1000)
Subject: Don't show the blaster weaponstart message in a weapon arena mode
X-Git-Tag: xonotic-v0.8.2~1946
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=acd819c5f59288e6cfbbf9a02cf7e7c75edb2cf7;p=xonotic%2Fxonotic-data.pk3dir.git

Don't show the blaster weaponstart message in a weapon arena mode
---

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
index a1b299d9f..ec77c8c41 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
@@ -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"));
diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index c7703e2e5..3621f7214 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -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");