OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: Commander Keen's death sequence had one state duplicated.

Browse source 
- Fixed: Due to the changes for custom states the internal weapons shouldn't
  define a holdatk state unless it differs from the attack state.
- Fixed: The bot code tried to spawn ACajunBodyNode instead of CajunBodyNode.
- Changed: MF2_BLASTED doesn't work well for players so I had to take it out
  of A_BlastRadius.
- Fixed: When MF2_BLASTED was cleared MF2_SLIDE got cleared as well, no matter
  whether it was set by default or not. Now the MF2_SLIDE check checks both
  flags and the BlastRadius code doesn't set MF2_SLIDE anymore.


SVN r422 (trunk)
This commit is contained in:
Christoph Oelckers 2006-12-23 12:12:06 +00:00
commit 9b0b199bb5
20 changed files with 31 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/p_mobj.cpp
View file

@ -1483,7 +1483,7 @@ void P_XYMovement (AActor *mo, fixed_t scrollx, fixed_t scrolly)
{
// blocked move
if (mo->flags2 & MF2_SLIDE || bForceSlide)
if ((mo->flags2 & (MF2_SLIDE|MF2_BLASTED) || bForceSlide) && !(mo->flags&MF_MISSILE))
{
// try to slide along it
if (BlockingMobj == NULL)
@ -2794,10 +2794,6 @@ void AActor::Tick ()
if ((momx | momy) == 0 && (flags2 & MF2_BLASTED))
{ // Reset to not blasted when momentums are gone
flags2 &= ~MF2_BLASTED;
if (!(flags & MF_ICECORPSE))
{
flags2 &= ~MF2_SLIDE;
}
}
if (flags2 & MF2_FLOATBOB)