OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Reintroduced damage thrust clamping but with a higher threshold. The clamping

Browse source 
is now also done in floating point before any fixed point overflows can occur.


SVN r1670 (trunk)
This commit is contained in:
Christoph Oelckers 2009-06-16 22:04:26 +00:00
commit db0a924fc9
6 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/p_interaction.cpp
View file

@ -1043,16 +1043,10 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
// Calculate this as float to avoid overflows so that the
// clamping that had to be done here can be removed.
thrust = FLOAT2FIXED((damage * 0.125 * kickback) / target->Mass);
double fltthrust = clamp((damage * 0.125 * kickback) / target->Mass, 0.,mod == NAME_MDK? 10. : 32.);
thrust = FLOAT2FIXED(fltthrust);
// [RH] If thrust overflows, use a more reasonable amount
/* old fixed point code that could overflow.
thrust = damage*(FRACUNIT>>3)*kickback / target->Mass;
if (thrust < 0 || thrust > 10*FRACUNIT)
{
thrust = 10*FRACUNIT;
}
*/
// make fall forwards sometimes
if ((damage < 40) && (damage > target->health)
&& (target->z - origin->z > 64*FRACUNIT)