OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: All melee attack functions only used the target acquired by P_AimLineAttack for all subsequent calculations, not the actual victim of the attack.

Browse source 
SVN r2373 (trunk)
This commit is contained in:
Christoph Oelckers 2010-06-13 11:14:01 +00:00
commit e535b40a9e
14 changed files with 39 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/p_map.cpp
View file

@ -3297,7 +3297,7 @@ static bool CheckForSpectral (FTraceResults &res)
//==========================================================================
AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
int pitch, int damage, FName damageType, const PClass *pufftype, bool ismeleeattack)
int pitch, int damage, FName damageType, const PClass *pufftype, bool ismeleeattack, AActor **victim)
{
fixed_t vx, vy, vz, shootz;
FTraceResults trace;
@ -3308,6 +3308,11 @@ AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
AActor *puff = NULL;
int flags = ismeleeattack? PF_MELEERANGE : 0;
if (victim != NULL)
{
*victim = NULL;
}
angle >>= ANGLETOFINESHIFT;
pitch = (angle_t)(pitch) >> ANGLETOFINESHIFT;
@ -3490,6 +3495,10 @@ AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
}
P_DamageMobj (trace.Actor, puff ? puff : t1, t1, damage, damageType, flags);
}
if (victim != NULL)
{
*victim = trace.Actor;
}
}
if (trace.CrossedWater)
{
@ -3511,16 +3520,20 @@ AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
}
AActor *P_LineAttack (AActor *t1, angle_t angle, fixed_t distance,
int pitch, int damage, FName damageType, FName pufftype, bool ismeleeattack)
int pitch, int damage, FName damageType, FName pufftype, bool ismeleeattack, AActor **victim)
{
const PClass * type = PClass::FindClass(pufftype);
if (victim != NULL)
{
*victim = NULL;
}
if (type == NULL)
{
Printf("Attempt to spawn unknown actor type '%s'\n", pufftype.GetChars());
}
else
{
return P_LineAttack(t1, angle, distance, pitch, damage, damageType, type, ismeleeattack);
return P_LineAttack(t1, angle, distance, pitch, damage, damageType, type, ismeleeattack, victim);
}
return NULL;
}