zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-15 16:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Add 'add' parameter to SetActorVelocity.

Browse source 
SVN r1810 (trunk)
This commit is contained in:
Randy Heit 2009-09-08 03:19:57 +00:00
parent 17a43e7753
commit 173646971d
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_acs.cpp
View file

@ -3059,7 +3059,7 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args)
case ACSF_SetActorVelocity: case ACSF_SetActorVelocity:
if (args[0] == 0) if (args[0] == 0)
{ {
P_Thing_SetVelocity(activator, args[1], args[2], args[3], !!args[4]); P_Thing_SetVelocity(activator, args[1], args[2], args[3], !!args[4], !!args[5]);
} }
else else
{ {
@ -3067,7 +3067,7 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args)
while ( (actor = iterator.Next ()) ) while ( (actor = iterator.Next ()) )
{ {
P_Thing_SetVelocity(actor, args[1], args[2], args[3], !!args[4]); P_Thing_SetVelocity(actor, args[1], args[2], args[3], !!args[4], !!args[5]);
} }
} }
return 0; return 0;

2
src/p_local.h
View file

@ -139,7 +139,7 @@ bool P_Thing_Projectile (int tid, AActor *source, int type, const char * type_na
bool P_MoveThing(AActor *source, fixed_t x, fixed_t y, fixed_t z, bool fog); bool P_MoveThing(AActor *source, fixed_t x, fixed_t y, fixed_t z, bool fog);
bool P_Thing_Move (int tid, AActor *source, int mapspot, bool fog); bool P_Thing_Move (int tid, AActor *source, int mapspot, bool fog);
int P_Thing_Damage (int tid, AActor *whofor0, int amount, FName type); int P_Thing_Damage (int tid, AActor *whofor0, int amount, FName type);
void P_Thing_SetVelocity(AActor *actor, fixed_t vx, fixed_t vy, fixed_t vz, bool add); void P_Thing_SetVelocity(AActor *actor, fixed_t vx, fixed_t vy, fixed_t vz, bool add, bool setbob);
void P_RemoveThing(AActor * actor); void P_RemoveThing(AActor * actor);
bool P_Thing_Raise(AActor *thing); bool P_Thing_Raise(AActor *thing);

4
src/p_things.cpp
View file

@ -478,7 +478,7 @@ bool P_Thing_Raise(AActor *thing)
return true; return true;
} }
void P_Thing_SetVelocity(AActor *actor, fixed_t vx, fixed_t vy, fixed_t vz, bool add) void P_Thing_SetVelocity(AActor *actor, fixed_t vx, fixed_t vy, fixed_t vz, bool add, bool setbob)
{ {
if (actor != NULL) if (actor != NULL)
{ {
@ -490,7 +490,7 @@ void P_Thing_SetVelocity(AActor *actor, fixed_t vx, fixed_t vy, fixed_t vz, bool
actor->velx += vx; actor->velx += vx;
actor->vely += vy; actor->vely += vy;
actor->velz += vz; actor->velz += vz;
if (actor->player != NULL) if (setbob && actor->player != NULL)
{ {
actor->player->velx += vx; actor->player->velx += vx;
actor->player->vely += vy; actor->player->vely += vy;