zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix cerberus spinning not just if NOONE_EXTENSIONS is enabled

Browse source
This commit is contained in:
CommonLoon102 2020-02-02 22:47:34 +01:00 committed by Christoph Oelckers
parent 256bc3ec08
commit 081bbe6532
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/blood/src/ai.cpp
View file

@ -167,7 +167,6 @@ bool CanMove(spritetype *pSprite, int a2, int nAngle, int nRange)
if (pXSector->Depth) if (pXSector->Depth)
Depth = 1; Depth = 1;
if (sector[nSector].type == kSectorDamage || pXSector->damageType > 0) { if (sector[nSector].type == kSectorDamage || pXSector->damageType > 0) {
#ifdef NOONE_EXTENSIONS
// a quick fix for Cerberus spinning in E3M7-like maps, where damage sectors is used. // a quick fix for Cerberus spinning in E3M7-like maps, where damage sectors is used.
// It makes ignore danger if enemy immune to N damageType. As result Cerberus start acting like // It makes ignore danger if enemy immune to N damageType. As result Cerberus start acting like
// in Blood 1.0 so it can move normally to player. It's up to you for adding rest of enemies here as // in Blood 1.0 so it can move normally to player. It's up to you for adding rest of enemies here as
@ -175,16 +174,17 @@ bool CanMove(spritetype *pSprite, int a2, int nAngle, int nRange)
switch (pSprite->type) { switch (pSprite->type) {
case kDudeCerberusTwoHead: // Cerberus case kDudeCerberusTwoHead: // Cerberus
case kDudeCerberusOneHead: // 1 Head Cerberus case kDudeCerberusOneHead: // 1 Head Cerberus
if (VanillaMode() || !isImmune(pSprite, pXSector->damageType)) if (VanillaMode()
#ifdef NOONE_EXTENSIONS
|| !isImmune(pSprite, pXSector->damageType)
#endif
)
Crusher = 1; Crusher = 1;
break; break;
default: default:
Crusher = 1; Crusher = 1;
break; break;
} }
#else
Crusher = 1;
#endif
} }
} }
int nUpper = gUpperLink[nSector]; int nUpper = gUpperLink[nSector];