Merge pull request #350 from MajorCooke/Fixes

Small bugfixes
This commit is contained in:
coelckers 2015-07-27 19:58:29 +02:00
commit 2e75825f12
1 changed files with 3 additions and 3 deletions

View File

@ -4039,7 +4039,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ScaleVelocity)
return;
}
INTBOOL was_moving = self->velx | self->vely | self->velz;
INTBOOL was_moving = ref->velx | ref->vely | ref->velz;
ref->velx = FixedMul(ref->velx, scale);
ref->vely = FixedMul(ref->vely, scale);
@ -4061,7 +4061,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ScaleVelocity)
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ChangeVelocity)
{
ACTION_PARAM_START(4);
ACTION_PARAM_START(5);
ACTION_PARAM_FIXED(x, 0);
ACTION_PARAM_FIXED(y, 1);
ACTION_PARAM_FIXED(z, 2);
@ -4102,7 +4102,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ChangeVelocity)
if (was_moving)
{
CheckStopped(self);
CheckStopped(ref);
}
}