Merge branch 'Mario/playerdemo_removal'

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

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 42d72edf415e00183eb1236bef310a6361f8461b..cf114e5f058860e6a55ef47febf11f0e17a31f63 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -10,7 +10,6 @@
 #include "miscfunctions.qh"
 #include "portals.qh"
 #include "teamplay.qh"
-#include "playerdemo.qh"
 #include "spawnpoints.qh"
 #include "resources.qh"
 #include "g_damage.qh"
@@ -751,6 +750,8 @@ void PutPlayerInServer(entity this)
                this.(weaponentity).weaponname = "";
                this.(weaponentity).m_switchingweapon = WEP_Null;
                this.(weaponentity).cnt = -1;
+
+               W_WeaponFrame(this, weaponentity);
        }
 
        MUTATOR_CALLHOOK(PlayerWeaponSelect, this);
@@ -2819,8 +2820,6 @@ void PlayerPostThink (entity this)
                WaypointSprite_UpdateHealth(this.waypointsprite_attachedforcarrier, '1 0 0' * v);
     }
 
-       playerdemo_write(this);
-
        CSQCMODEL_AUTOUPDATE(this);
 }