OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: P_CheckSwitchRange accessed invalid memory when testing a one-sided

Browse source 
line.
- Fixed: P_SpawnPuff assumed that all melee attacks have the same range
  (MELEERANGE) and didn't set the puff to its melee state if the range
  was different. Even worse, it checked a global variable for this so
  the behavior was undefined when P_SpawnPuff was called from anywhere
  else but P_LineAttack. To reduce the amount of parameters I combined
  this information with the hitthing and temporary parameters into one
  flags parameter. Also changed P_LineAttack so that it gets passed
  an additional parameter that specifies whether the attack is a melee
  attack or not and set this to true in all calls that are to be considered
  melee attacks. I couldn't use the damage type because A_CustomPunch
  and A_CustomMeleeAttack allow passing any damage type they want.
- Added a sprite option as an alternative of particles for FX_ROCKET 
  and FX_GRENADE.


SVN r879 (trunk)
This commit is contained in:
Christoph Oelckers 2008-04-04 14:31:20 +00:00
commit cb1bd7739e
29 changed files with 194 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_effect.cpp
View file

@ -228,7 +228,7 @@ void P_RunEffect (AActor *actor, int effects)
particle_t *particle;
int i;
if ((effects & FX_ROCKET) && cl_rockettrails)
if ((effects & FX_ROCKET) && (cl_rockettrails & 1))
{
// Rocket trail
@ -274,7 +274,7 @@ void P_RunEffect (AActor *actor, int effects)
break;
}
}
if ((effects & FX_GRENADE) && (cl_rockettrails))
if ((effects & FX_GRENADE) && (cl_rockettrails & 1))
{
// Grenade trail