Merge remote-tracking branch 'origin/master' into samual/update_effects_tab

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

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 930ea1b76d1be99eee2b0ac94f7b8eac3c221b33..03affc67c1473b7ea844e399cb8876d9f5379d4d 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -727,7 +727,7 @@ void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint
                }*/
                if(autocvar_cl_spawn_point_particles)
                {
-                       if(teamplay)
+                       if((serverflags & SERVERFLAG_TEAMPLAY))
                        {
                                switch(teamnum)
                                {
@@ -1027,8 +1027,6 @@ void Ent_Init()
 
        armorblockpercent = ReadByte() / 255.0;
 
-       g_weaponswitchdelay = ReadByte() / 255.0;
-
        g_balance_grenadelauncher_bouncefactor = ReadCoord();
        g_balance_grenadelauncher_bouncestop = ReadCoord();
        g_balance_electro_secondary_bouncefactor = ReadCoord();