OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: When the DONTMOVE flag for A_Chase was used, movecount was not decreased

Browse source 
resulting in missile attacks not working.
- Fixed: Hitscan attacks used the puff's position to calculate the trajectory for
  weapon kickback.


SVN r568 (trunk)
This commit is contained in:
Christoph Oelckers 2007-11-19 08:13:23 +00:00
commit ba61c60d52
6 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/p_interaction.cpp
View file

@ -948,7 +948,9 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
if (kickback)
{
ang = R_PointToAngle2 (inflictor->x, inflictor->y,
AActor *origin = (source && (flags & DMG_INFLICTOR_IS_PUFF))? source : inflictor;
ang = R_PointToAngle2 (origin->x, origin->y,
target->x, target->y);
thrust = damage*(FRACUNIT>>3)*kickback / target->Mass;
// [RH] If thrust overflows, use a more reasonable amount
@ -958,7 +960,7 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
}
// make fall forwards sometimes
if ((damage < 40) && (damage > target->health)
&& (target->z - inflictor->z > 64*FRACUNIT)
&& (target->z - origin->z > 64*FRACUNIT)
&& (pr_damagemobj()&1)
// [RH] But only if not too fast and not flying
&& thrust < 10*FRACUNIT