mirror of
https://github.com/nzp-team/quakec.git
synced 2024-11-29 15:22:29 +00:00
SERVER: Fix third person walk animations sometimes canceling action animations
This commit is contained in:
parent
a02b69b5d6
commit
bc411eac73
2 changed files with 4 additions and 1 deletions
|
@ -468,7 +468,8 @@ void() PlayerPostThink =
|
||||||
float movelen = vlen(input_movevalues);
|
float movelen = vlen(input_movevalues);
|
||||||
if(movelen > 300)
|
if(movelen > 300)
|
||||||
{
|
{
|
||||||
if (self.tp_anim_time < time) {
|
if (self.tp_anim_time < time && self.reload_delay < time && self.reload_delay2 < time && self.fire_delay < time &&
|
||||||
|
self.fire_delay2 < time && self.knife_delay < time) {
|
||||||
if (self.sprinting) {
|
if (self.sprinting) {
|
||||||
PAnim_Sprint();
|
PAnim_Sprint();
|
||||||
self.tp_anim_time = time + 0.5;
|
self.tp_anim_time = time + 0.5;
|
||||||
|
|
|
@ -185,6 +185,8 @@ void() W_SprintStop =
|
||||||
Weapon_PlayViewModelAnimation(ANIM_SPRINT_STOP, ReturnWeaponModel, 0);
|
Weapon_PlayViewModelAnimation(ANIM_SPRINT_STOP, ReturnWeaponModel, 0);
|
||||||
|
|
||||||
self.zoom = 0;
|
self.zoom = 0;
|
||||||
|
self.tp_anim_time = 0;
|
||||||
|
PAnim_Walk6(); // Run Walk for a few frames to simulate an ease in velocity
|
||||||
self.sprinting = 0;
|
self.sprinting = 0;
|
||||||
self.into_sprint = 0;
|
self.into_sprint = 0;
|
||||||
self.reload_delay2 = self.fire_delay2 = self.reload_delay = self.fire_delay = 0;
|
self.reload_delay2 = self.fire_delay2 = self.reload_delay = self.fire_delay = 0;
|
||||||
|
|
Loading…
Reference in a new issue