diff --git a/source/games/blood/src/ai.cpp b/source/games/blood/src/ai.cpp index d9e53c8ce..612a597a9 100644 --- a/source/games/blood/src/ai.cpp +++ b/source/games/blood/src/ai.cpp @@ -1604,13 +1604,13 @@ void aiInitSprite(DBloodActor* actor) { actor->dudeExtra.thinkTime = 0; aiNewState(actor, NAME_zombieSIdle); - actor->spr.flags &= ~1; + actor->spr.flags &= ~kPhysMove; break; } case kDudeZombieAxeBuried: { actor->dudeExtra.thinkTime = 0; aiNewState(actor, NAME_zombieEIdle); - actor->spr.flags &= ~1; + actor->spr.flags &= ~kPhysMove; break; } case kDudeGargoyleFlesh: @@ -1631,7 +1631,6 @@ void aiInitSprite(DBloodActor* actor) } case kDudeCerberusOneHead: { if (!VanillaMode()) { - actor->spr.xint = 1; actor->dudeExtra.thinkTime = 0; aiNewState(actor, NAME_Idle); break; @@ -1731,24 +1730,29 @@ void aiInitSprite(DBloodActor* actor) case kDudeSpiderBrown: case kDudeSpiderRed: case kDudeSpiderBlack: - if (actor->spr.cstat & CSTAT_SPRITE_YFLIP) actor->spr.flags |= 9; - else actor->spr.flags = 15; + if (actor->spr.cstat & CSTAT_SPRITE_YFLIP) actor->spr.flags |= kPhysMove | kHitagAutoAim; + else actor->spr.flags = kPhysMove | kPhysGravity | kPhysFalling | kHitagAutoAim; break; case kDudeGargoyleFlesh: case kDudeGargoyleStone: case kDudePhantasm: case kDudeBoneEel: case kDudeBat: - actor->spr.flags |= 9; + actor->spr.flags |= kPhysMove | kHitagAutoAim; break; case kDudeGillBeast: - if (pXSector && pXSector->Underwater) actor->spr.flags |= 9; - else actor->spr.flags = 15; + if (pXSector && pXSector->Underwater) actor->spr.flags |= kPhysMove | kHitagAutoAim; + else actor->spr.flags = kPhysMove | kPhysGravity | kPhysFalling | kHitagAutoAim; break; case kDudeZombieAxeBuried: case kDudeZombieAxeLaying: - actor->spr.flags = 7; + actor->spr.flags = kPhysMove | kPhysGravity | kPhysFalling; break; + case kDudeCerberusOneHead: + if (!VanillaMode()) + actor->spr.xint = 1; + break; + #ifdef NOONE_EXTENSIONS case kDudePodMother: // FakeDude type if (gModernMap) break; @@ -1768,7 +1772,7 @@ void aiInitSprite(DBloodActor* actor) // go default #endif default: - actor->spr.flags = 15; + actor->spr.flags = kPhysMove | kPhysGravity | kPhysFalling | kHitagAutoAim; break; }