]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Actually set the melee anim.
authorSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 19 May 2011 19:42:56 +0000 (15:42 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 19 May 2011 19:42:56 +0000 (15:42 -0400)
qcsrc/server/cl_weaponsystem.qc

index 4233e7d92d755b7651a60362f27080c192e888c7..6a3f5ea889515ca7cc2ac568effbe999dcd08ded 100644 (file)
@@ -1258,7 +1258,6 @@ void weapon_thinkf(float fr, float t, void() func)
        //dprint("next ", ftos(self.weapon_nextthink), "\n");
 
     // The shoot animation looks TERRIBLE without animation blending! Yay for moonwalking while shooting!
-    /*
        if (restartanim)
        if (t)
        if (!self.crouch) // shoot anim stands up, this looks bad
@@ -1266,12 +1265,11 @@ void weapon_thinkf(float fr, float t, void() func)
                local vector anim;
                if(self.weapon == WEP_SHOTGUN && self.BUTTON_ATCK2)
                        anim = self.anim_melee;
-               else
-                       anim = self.anim_shoot;
+               /*else
+                       anim = self.anim_shoot;*/
                anim_z = anim_y / (t + sys_frametime);
                setanim(self, anim, FALSE, TRUE, TRUE);
        }
-    */
 };
 
 void weapon_boblayer1(float spd, vector org)