OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added a Z offsetting parameter to the ZScript LineAttack function.

Browse source 
- Added LAF_OVERRIDEZ flag to LineAttack. Disregards all internal offsetting aside the actor's Z position before adding the offset parameter.
This commit is contained in:
Major Cooke 2017-05-17 11:50:59 -05:00 • committed by Christoph Oelckers
commit 65f13b0927
4 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/p_map.cpp
View file

@ -4390,7 +4390,7 @@ static ETraceStatus CheckForActor(FTraceResults &res, void *userdata)
//==========================================================================
AActor *P_LineAttack(AActor *t1, DAngle angle, double distance,
DAngle pitch, int damage, FName damageType, PClassActor *pufftype, int flags, FTranslatedLineTarget*victim, int *actualdamage)
DAngle pitch, int damage, FName damageType, PClassActor *pufftype, int flags, FTranslatedLineTarget*victim, int *actualdamage, double sz)
{
bool nointeract = !!(flags & LAF_NOINTERACT);
DVector3 direction;
@ -4435,6 +4435,12 @@ AActor *P_LineAttack(AActor *t1, DAngle angle, double distance,
shootz += 8;
}
// [MC] If overriding, set it to the base of the actor.
// Offset by the amount specified.
if (flags & LAF_OVERRIDEZ)
shootz = t1->Z();
shootz += sz;
// We need to check the defaults of the replacement here
AActor *puffDefaults = GetDefaultByType(pufftype->GetReplacement());
@ -4691,7 +4697,7 @@ AActor *P_LineAttack(AActor *t1, DAngle angle, double distance,
}
AActor *P_LineAttack(AActor *t1, DAngle angle, double distance,
DAngle pitch, int damage, FName damageType, FName pufftype, int flags, FTranslatedLineTarget *victim, int *actualdamage)
DAngle pitch, int damage, FName damageType, FName pufftype, int flags, FTranslatedLineTarget *victim, int *actualdamage, double sz)
{
PClassActor *type = PClass::FindActor(pufftype);
if (type == NULL)
@ -4705,7 +4711,7 @@ AActor *P_LineAttack(AActor *t1, DAngle angle, double distance,
}
else
{
return P_LineAttack(t1, angle, distance, pitch, damage, damageType, type, flags, victim, actualdamage);
return P_LineAttack(t1, angle, distance, pitch, damage, damageType, type, flags, victim, actualdamage, sz);
}
}
@ -4720,10 +4726,11 @@ DEFINE_ACTION_FUNCTION(AActor, LineAttack)
PARAM_CLASS(puffType, AActor);
PARAM_INT_DEF(flags);
PARAM_POINTER_DEF(victim, FTranslatedLineTarget);
PARAM_FLOAT_DEF(sz);
int acdmg;
if (puffType == nullptr) puffType = PClass::FindActor("BulletPuff"); // P_LineAttack does not work without a puff to take info from.
auto puff = P_LineAttack(self, angle, distance, pitch, damage, damageType, puffType, flags, victim, &acdmg);
auto puff = P_LineAttack(self, angle, distance, pitch, damage, damageType, puffType, flags, victim, &acdmg, sz);
if (numret > 0) ret[0].SetObject(puff);
if (numret > 1) ret[1].SetInt(acdmg), numret = 2;
return numret;