From: Mario <mario@smbclan.net>
Date: Sat, 24 Aug 2019 18:29:36 +0000 (+1000)
Subject: Add the weaponarena weapons onto start_weapons instead of setting it, fixes new toys
X-Git-Tag: xonotic-v0.8.5~1360^2~8
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=8328c880c2bd7615ccf5f7f4b69a4593b97dcfe7;p=xonotic%2Fxonotic-data.pk3dir.git

Add the weaponarena weapons onto start_weapons instead of setting it, fixes new toys
---

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 273b854ce..633ee47f4 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -530,9 +530,9 @@ void weaponarena_available_update(entity this)
 		if(wep_available && !(it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_FLAG_HIDDEN))
 			g_weaponarena_weapons |= WepSet_FromWeapon(it);
 	});
-	start_weapons = g_weaponarena_weapons;
+	start_weapons |= g_weaponarena_weapons;
 	if(warmup_stage)
-		warmup_start_weapons = start_weapons;
+		warmup_start_weapons |= g_weaponarena_weapons;
 }
 
 void readplayerstartcvars()