Merge branch 'master' into TimePath/csqc_viewmodels

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

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 84e905e85fea28e858763e3932a21bc2c09ad2d7..bacb6bcb9e4c5c95cb044333a4056bcbc8e5d22f 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -9,6 +9,7 @@
 #include "teamplay.qh"
 #include "weapons/throwing.qh"
 #include "command/common.qh"
+#include "../common/anim.qh"
 #include "../common/animdecide.qh"
 #include "../common/csqcmodel_settings.qh"
 #include "../common/deathtypes/all.qh"
@@ -165,16 +166,6 @@ void player_anim ()
                animbits |= ANIMSTATE_DUCK;
        animdecide_setstate(self, animbits, false);
        animdecide_setimplicitstate(self, (self.flags & FL_ONGROUND));
-
-       .entity weaponentity = weaponentities[0]; // TODO: unhardcode
-       {
-               if (self.(weaponentity))
-               {
-                       updateanim(self.(weaponentity));
-                       if (!self.(weaponentity).animstate_override)
-                               setanim(self.(weaponentity), self.(weaponentity).anim_idle, true, false, false);
-               }
-       }
 }
 
 void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)