OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

May 7, 2006 (Changes by Graf Zahl)

Browse source 
- Added a misc/secret sound definition for Heretic.
- Fixed: Powered up weapons were not properly deselected when the level ended
  and their ready state was different from the main weapon's.
- Made some improvements to A_CountdownArg.
- Removed the 'Yes', 'No' and 'Greetings' state assignment commands. They haven't
  been documented and thus haven't been used at all so far. Therefore they don't 
  need to be handled considering that they will go away anyway.
- Changed the DECORATE state parser so that Stop can also be specified right after
  a label, in addition to goto.


SVN r84 (trunk)
This commit is contained in:
Christoph Oelckers 2006-05-07 23:55:17 +00:00
commit d4160f7211
6 changed files with 48 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/thingdef_codeptr.cpp
View file

@ -1550,7 +1550,18 @@ void A_CountdownArg(AActor * self)
if (index<=0 || index>5) return;
if (!self->args[index]--)
{
self->SetState(self->DeathState);
if (self->flags&MF_MISSILE)
{
P_ExplodeMissile(self, NULL);
}
else if (self->flags&MF_SHOOTABLE)
{
P_DamageMobj (self, NULL, NULL, self->health, MOD_UNKNOWN);
}
else
{
self->SetState(self->DeathState);
}
}
}