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

Allow ACS SpawnDecal zoffset and distance args to be fixed point

Browse source 
The wiki currently says they should be fixed point but the code
currently treats them as integers. Given that they are placed with
double precision horizontally, it is odd that the same precision
cannot be applied vertically. Changing this would break existing maps
so add two flags to support both types.
This commit is contained in:
James Le Cuirot 2021-03-30 21:18:18 +01:00 committed by Rachael Alexanderson
parent cf30982ddf
commit 90381c4ad6
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/playsim/p_acs.cpp
View file

@ -569,6 +569,8 @@ FRandom pr_acs ("ACS");
// SpawnDecal flags // SpawnDecal flags
#define SDF_ABSANGLE 1 #define SDF_ABSANGLE 1
#define SDF_PERMANENT 2 #define SDF_PERMANENT 2
#define SDF_FIXED_ZOFF 4
#define SDF_FIXED_DISTANCE 8
// GetArmorInfo // GetArmorInfo
enum enum
@ -6054,7 +6056,7 @@ doplaysound: if (funcIndex == ACSF_PlayActorSound)
} }
case ACSF_SpawnDecal: case ACSF_SpawnDecal:
// int SpawnDecal(int tid, str decalname, int flags, fixed angle, int zoffset, int distance) // int SpawnDecal(int tid, str decalname, int flags, fixed angle, int|fixed zoffset, int|fixed distance)
// Returns number of decals spawned (not including spreading) // Returns number of decals spawned (not including spreading)
{ {
int count = 0; int count = 0;
@ -6063,8 +6065,8 @@ doplaysound: if (funcIndex == ACSF_PlayActorSound)
{ {
int flags = (argCount > 2) ? args[2] : 0; int flags = (argCount > 2) ? args[2] : 0;
DAngle angle = ACSToAngle((argCount > 3) ? args[3] : 0); DAngle angle = ACSToAngle((argCount > 3) ? args[3] : 0);
int zoffset = (argCount > 4) ? args[4]: 0; double zoffset = (argCount > 4) ? ((flags & SDF_FIXED_ZOFF) ? ACSToDouble(args[4]) : args[4]) : 0;
int distance = (argCount > 5) ? args[5] : 64; double distance = (argCount > 5) ? ((flags & SDF_FIXED_DISTANCE) ? ACSToDouble(args[5]) : args[5]) : 64;
if (args[0] == 0) if (args[0] == 0)
{ {