did some flag naming

This commit is contained in:
Christoph Oelckers 2023-10-11 22:11:04 +02:00
parent b1538ca3ec
commit 065de5979d

View file

@ -1733,13 +1733,13 @@ void aiInitSprite(DBloodActor* actor)
{ {
actor->dudeExtra.thinkTime = 0; actor->dudeExtra.thinkTime = 0;
aiNewState(actor, &zombieSIdle); aiNewState(actor, &zombieSIdle);
actor->spr.flags &= ~1; actor->spr.flags &= ~kPhysMove;
break; break;
} }
case kDudeZombieAxeBuried: { case kDudeZombieAxeBuried: {
actor->dudeExtra.thinkTime = 0; actor->dudeExtra.thinkTime = 0;
aiNewState(actor, &zombieEIdle); aiNewState(actor, &zombieEIdle);
actor->spr.flags &= ~1; actor->spr.flags &= ~kPhysMove;
break; break;
} }
case kDudeGargoyleFlesh: case kDudeGargoyleFlesh:
@ -1859,24 +1859,25 @@ void aiInitSprite(DBloodActor* actor)
case kDudeSpiderBrown: case kDudeSpiderBrown:
case kDudeSpiderRed: case kDudeSpiderRed:
case kDudeSpiderBlack: case kDudeSpiderBlack:
if (actor->spr.cstat & CSTAT_SPRITE_YFLIP) actor->spr.flags |= 9; if (actor->spr.cstat & CSTAT_SPRITE_YFLIP) actor->spr.flags |= kPhysMove | kHitagAutoAim;
else actor->spr.flags = 15; else actor->spr.flags = kPhysMove | kPhysGravity | kPhysFalling | kHitagAutoAim;
break; break;
case kDudeGargoyleFlesh: case kDudeGargoyleFlesh:
case kDudeGargoyleStone: case kDudeGargoyleStone:
case kDudePhantasm: case kDudePhantasm:
case kDudeBoneEel: case kDudeBoneEel:
case kDudeBat: case kDudeBat:
actor->spr.flags |= 9; actor->spr.flags |= kPhysMove | kHitagAutoAim;
break; break;
case kDudeGillBeast: case kDudeGillBeast:
if (pXSector && pXSector->Underwater) actor->spr.flags |= 9; if (pXSector && pXSector->Underwater) actor->spr.flags |= kPhysMove | kHitagAutoAim;
else actor->spr.flags = 15; else actor->spr.flags = kPhysMove | kPhysGravity | kPhysFalling | kHitagAutoAim;
break; break;
case kDudeZombieAxeBuried: case kDudeZombieAxeBuried:
case kDudeZombieAxeLaying: case kDudeZombieAxeLaying:
actor->spr.flags = 7; actor->spr.flags = kPhysMove | kPhysGravity | kPhysFalling;
break; break;
#ifdef NOONE_EXTENSIONS #ifdef NOONE_EXTENSIONS
case kDudePodMother: // FakeDude type case kDudePodMother: // FakeDude type
if (gModernMap) break; if (gModernMap) break;
@ -1896,7 +1897,7 @@ void aiInitSprite(DBloodActor* actor)
// go default // go default
#endif #endif
default: default:
actor->spr.flags = 15; actor->spr.flags = kPhysMove | kPhysGravity | kPhysFalling | kHitagAutoAim;
break; break;
} }