Merge branch 'master' into Lyberta/RandomStartWeapons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / client.qc

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index f1d417d6bace6987d6f1a72984f6f77260b7db0f..1997b8e5776d887fd26f804585845b04a70f550e 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -544,6 +544,10 @@ void PutPlayerInServer(entity this)
                this.health = start_health;
                this.armorvalue = start_armorvalue;
                this.weapons = start_weapons;
+               GivePlayerRandomWeapons(this, random_start_weapons_count,
+                       cvar_string("g_random_start_weapons"), random_start_shells,
+                       random_start_bullets, random_start_rockets, random_start_cells,
+                       random_start_plasma);
        }
        SetSpectatee_status(this, 0);