zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace function variables to DVector3

This commit is contained in:
Mekboss 2020-03-30 18:52:27 +03:00 committed by Christoph Oelckers
parent ba43244764
commit 0e9ca3c850
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/playsim/a_decals.cpp
View File

@ -830,14 +830,14 @@ DBaseDecal *DImpactDecal::CloneSelf (const FDecalTemplate *tpl, double ix, doubl
//
//----------------------------------------------------------------------------
void SprayDecal(AActor *shooter, const char *name, double distance, double DirX, double DirY, double DirZ)
void SprayDecal(AActor *shooter, const char *name, double distance, DVector3 Dir)
{
FTraceResults trace;
DVector3 vec;
//use new behavior only if directional vector not equal to zero vector
if (DirX != 0 || DirY != 0 || DirZ != 0)
if (!Dir.isZero() )
{
vec = DVector3(DirX, DirY, DirZ);
vec = Dir;
}
else

2
src/playsim/a_sharedglobal.h
View File

@ -12,7 +12,7 @@ class DBaseDecal;
struct SpreadInfo;
DBaseDecal *ShootDecal(FLevelLocals *Level, const FDecalTemplate *tpl, sector_t *sec, double x, double y, double z, DAngle angle, double tracedist, bool permanent);
void SprayDecal(AActor *shooter, const char *name,double distance = 172., double DirX = 0., double DirY = 0., double DirZ = 0.);
void SprayDecal(AActor *shooter, const char *name,double distance = 172., DVector3 Dir = (0, 0, 0) );
class DBaseDecal : public DThinker
{

2
src/playsim/p_actionfunctions.cpp
View File

@ -4920,7 +4920,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_SprayDecal)
PARAM_FLOAT(DirX);
PARAM_FLOAT(DirY);
PARAM_FLOAT(DirZ);
SprayDecal(self, name, dist, DirX, DirY, DirZ);
SprayDecal(self, name, dist, DVector3(DirX, DirY, DirZ) );
return 0;
}

2
wadsrc/static/zscript/actors/actor.zs
View File

@ -1157,7 +1157,7 @@ class Actor : Thinker native
native bool A_SetVisibleRotation(double anglestart = 0, double angleend = 0, double pitchstart = 0, double pitchend = 0, int flags = 0, int ptr = AAPTR_DEFAULT);
native void A_SetTranslation(name transname);
native bool A_SetSize(double newradius = -1, double newheight = -1, bool testpos = false);
native void A_SprayDecal(String name, double dist = 172, double DirX = 0, double DirY = 0, double DirZ = 0);
native void A_SprayDecal(String name, double dist = 172, vector3 Dir = (0, 0, 0) );
native void A_SetMugshotState(String name);
native void CopyBloodColor(Actor other);