]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Add the weaponarena weapons onto start_weapons instead of setting it, fixes new toys
authorMario <mario@smbclan.net>
Sat, 24 Aug 2019 18:29:36 +0000 (04:29 +1000)
committerMario <mario@smbclan.net>
Sat, 24 Aug 2019 18:29:36 +0000 (04:29 +1000)
qcsrc/server/miscfunctions.qc

index 273b854ce966e96807a01414fc2596fcbf0a90ce..633ee47f47bc1e8a7afadc18a24be94f05b68d4f 100644 (file)
@@ -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()