zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-27 06:12:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'changevelptr' of https://github.com/MajorCooke/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2015-01-22 13:58:20 +01:00
commit afb90040c2
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/thingdef/thingdef_codeptr.cpp
View file

@ -4029,12 +4029,21 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ChangeVelocity)
ACTION_PARAM_FIXED(y, 1); ACTION_PARAM_FIXED(y, 1);
ACTION_PARAM_FIXED(z, 2); ACTION_PARAM_FIXED(z, 2);
ACTION_PARAM_INT(flags, 3); ACTION_PARAM_INT(flags, 3);
ACTION_PARAM_INT(ptr, 4);
INTBOOL was_moving = self->velx | self->vely | self->velz; AActor *ref = COPY_AAPTR(self, ptr);
if (!ref)
{
ACTION_SET_RESULT(false);
return;
}
INTBOOL was_moving = ref->velx | ref->vely | ref->velz;
fixed_t vx = x, vy = y, vz = z; fixed_t vx = x, vy = y, vz = z;
fixed_t sina = finesine[self->angle >> ANGLETOFINESHIFT]; fixed_t sina = finesine[ref->angle >> ANGLETOFINESHIFT];
fixed_t cosa = finecosine[self->angle >> ANGLETOFINESHIFT]; fixed_t cosa = finecosine[ref->angle >> ANGLETOFINESHIFT];
if (flags & 1) // relative axes - make x, y relative to actor's current angle if (flags & 1) // relative axes - make x, y relative to actor's current angle
{ {
@ -4043,15 +4052,15 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ChangeVelocity)
} }
if (flags & 2) // discard old velocity - replace old velocity with new velocity if (flags & 2) // discard old velocity - replace old velocity with new velocity
{ {
self->velx = vx; ref->velx = vx;
self->vely = vy; ref->vely = vy;
self->velz = vz; ref->velz = vz;
} }
else // add new velocity to old velocity else // add new velocity to old velocity
{ {
self->velx += vx; ref->velx += vx;
self->vely += vy; ref->vely += vy;
self->velz += vz; ref->velz += vz;
} }
if (was_moving) if (was_moving)

2
wadsrc/static/actors/actor.txt
View file

@ -293,7 +293,7 @@ ACTOR Actor native //: Thinker
action native A_SetPitch(float pitch, int flags = 0); action native A_SetPitch(float pitch, int flags = 0);
action native A_SetRoll(float roll, int flags = 0); action native A_SetRoll(float roll, int flags = 0);
action native A_ScaleVelocity(float scale); action native A_ScaleVelocity(float scale);
action native A_ChangeVelocity(float x = 0, float y = 0, float z = 0, int flags = 0); action native A_ChangeVelocity(float x = 0, float y = 0, float z = 0, int flags = 0, int ptr = AAPTR_DEFAULT);
action native A_SetArg(int pos, int value); action native A_SetArg(int pos, int value);
action native A_SetUserVar(name varname, int value); action native A_SetUserVar(name varname, int value);
action native A_SetUserArray(name varname, int index, int value); action native A_SetUserArray(name varname, int index, int value);