zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-18 22:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace function variables to DVector3

Browse source 
# Conflicts:
#	src/g_shared/a_sharedglobal.h
This commit is contained in:
Mekboss 2020-03-30 18:52:27 +03:00 committed by drfrag
parent bfe367fb20
commit 6e30ac5f3c
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/g_shared/a_decals.cpp
View file

@ -740,14 +740,14 @@ CCMD (spray)
Net_WriteString (argv[1]);
}
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/g_shared/a_sharedglobal.h
View file

@ -11,7 +11,7 @@ struct F3DFloor;
class DBaseDecal;
class DBaseDecal *ShootDecal(const FDecalTemplate *tpl, AActor *basisactor, 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/p_actionfunctions.cpp
View file

@ -4930,7 +4930,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

@ -1152,7 +1152,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);