OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Changed A_ChangeFlag so that it doesn't need to alter the flag

Browse source 
string. With strings being passed as names this is unsafe.
- Removed unused parameter types from the function parameter parser for
  DECORATE.
- Changed: All actor name parameters in DECORATE are now passed as 
  FNames, not as strings. 
- Fixed: The MAPINFO parser stored the RedirectType as a type pointer.
  But at this point DECORATE hasn't been read yet so this was limited to
  the internal classes.
- Fixed: TXT_NEED_IDCARD wasn't terminated with a ';'.
- Fixed: Strife's DeadRebel was missing its DoomEdNum.
- With names as type identifiers it is no longer necessary to remap
  the monster types to internal constants in A_BossDeath.
- Fixed: A_BossDeath got the string from a name - just to get a name from
  the string. Using the name directly is sufficient.


SVN r103 (trunk)
This commit is contained in:
Christoph Oelckers 2006-05-10 15:07:14 +00:00
commit 159c548c5a
14 changed files with 115 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/p_enemy.cpp
View file

@ -2349,25 +2349,14 @@ bool CheckBossDeath (AActor *actor)
//
void A_BossDeath (AActor *actor)
{
enum
{
MT_FATSO,
MT_BABY,
MT_BRUISER,
MT_CYBORG,
MT_SPIDER,
MT_HEAD,
MT_MINOTAUR,
MT_SORCERER2
} type;
FName type = actor->GetClass()->TypeName;
// Do generic special death actions first
bool checked = false;
FSpecialAction *sa = level.info->specialactions;
while (sa)
{
if (FName(actor->GetClass()->TypeName.GetChars()) == sa->Type)
if (type == sa->Type)
{
if (!checked && !CheckBossDeath(actor))
{
@ -2393,28 +2382,14 @@ void A_BossDeath (AActor *actor)
LEVEL_SORCERER2SPECIAL)) == 0)
return;
const PClass *actorType = actor->GetClass();
switch (actorType->TypeName)
{
case NAME_Fatso: type = MT_FATSO; break;
case NAME_Arachnotron: type = MT_BABY; break;
case NAME_BaronOfHell: type = MT_BRUISER; break;
case NAME_Cyberdemon: type = MT_CYBORG; break;
case NAME_SpiderMastermind: type = MT_SPIDER; break;
case NAME_Ironlich: type = MT_HEAD; break;
case NAME_Minotaur: type = MT_MINOTAUR; break;
case NAME_Sorcerer2: type = MT_SORCERER2; break;
default: return;
}
if (
((level.flags & LEVEL_MAP07SPECIAL) && (type == MT_FATSO || type == MT_BABY)) ||
((level.flags & LEVEL_BRUISERSPECIAL) && (type == MT_BRUISER)) ||
((level.flags & LEVEL_CYBORGSPECIAL) && (type == MT_CYBORG)) ||
((level.flags & LEVEL_SPIDERSPECIAL) && (type == MT_SPIDER)) ||
((level.flags & LEVEL_HEADSPECIAL) && (type == MT_HEAD)) ||
((level.flags & LEVEL_MINOTAURSPECIAL) && (type == MT_MINOTAUR)) ||
((level.flags & LEVEL_SORCERER2SPECIAL) && (type == MT_SORCERER2))
((level.flags & LEVEL_MAP07SPECIAL) && (type == NAME_Fatso || type == NAME_Arachnotron)) ||
((level.flags & LEVEL_BRUISERSPECIAL) && (type == NAME_BaronOfHell)) ||
((level.flags & LEVEL_CYBORGSPECIAL) && (type == NAME_Cyberdemon)) ||
((level.flags & LEVEL_SPIDERSPECIAL) && (type == NAME_SpiderMastermind)) ||
((level.flags & LEVEL_HEADSPECIAL) && (type == NAME_Ironlich)) ||
((level.flags & LEVEL_MINOTAURSPECIAL) && (type == NAME_Minotaur)) ||
((level.flags & LEVEL_SORCERER2SPECIAL) && (type == NAME_Sorcerer2))
)
;
else
@ -2432,13 +2407,13 @@ void A_BossDeath (AActor *actor)
}
if (level.flags & LEVEL_MAP07SPECIAL)
{
if (type == MT_FATSO)
if (type == NAME_Fatso)
{
EV_DoFloor (DFloor::floorLowerToLowest, NULL, 666, FRACUNIT, 0, 0, 0);
return;
}
if (type == MT_BABY)
if (type == NAME_Arachnotron)
{
EV_DoFloor (DFloor::floorRaiseByTexture, NULL, 667, FRACUNIT, 0, 0, 0);
return;