zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 14:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: If a damaged actor has negative mass, it needs to have its damage

Browse source 
thrust set to maximum instead of 0. See Action Doom's broken glass
  "CommanderKeens".


SVN r1816 (trunk)
This commit is contained in:
Randy Heit 2009-09-11 01:00:01 +00:00
parent e6174f5259
commit 38780d2d2a
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/rh-log.txt
View file

@ -1,4 +1,7 @@
September 10, 2009 September 10, 2009
- Fixed: If a damaged actor has negative mass, it needs to have its damage
thrust set to maximum instead of 0. See Action Doom's broken glass
"CommanderKeens".
- Changed the SCROLLTYPE define so that any extra bits set cause it to default - Changed the SCROLLTYPE define so that any extra bits set cause it to default
to 7. This effects action.wad, MAP02, lines 12054 and 12059, which had them to 7. This effects action.wad, MAP02, lines 12054 and 12059, which had them
at 128, so they no longer scrolled in r832+. at 128, so they no longer scrolled in r832+.

8
src/p_interaction.cpp
View file

@ -1047,7 +1047,13 @@ void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage
// Calculate this as float to avoid overflows so that the // Calculate this as float to avoid overflows so that the
// clamping that had to be done here can be removed. // clamping that had to be done here can be removed.
double fltthrust = clamp((damage * 0.125 * kickback) / target->Mass, 0.,mod == NAME_MDK? 10. : 32.); double fltthrust;
fltthrust = mod == NAME_MDK ? 10 : 32;
if (target->Mass > 0)
{
fltthrust = clamp((damage * 0.125 * kickback) / target->Mass, 0., fltthrust);
}
thrust = FLOAT2FIXED(fltthrust); thrust = FLOAT2FIXED(fltthrust);