From 5c9730766d4632e06083c24d3d5306854a7b68dd Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 6 May 2022 01:21:48 +0200 Subject: [PATCH] - dd self check for burning cultist fix Fix issue with spawned kDudeBurningCultist dudes entering water Copied from NBlood ae80eef10fdd42224c7b6e782f259ba23c1069e7 --- source/games/blood/src/actor.cpp | 2 +- source/games/blood/src/ai.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/games/blood/src/actor.cpp b/source/games/blood/src/actor.cpp index 76f674cff..8b212f7ec 100644 --- a/source/games/blood/src/actor.cpp +++ b/source/games/blood/src/actor.cpp @@ -5023,7 +5023,7 @@ void MoveDude(DBloodActor* actor) break; case kDudeBurningCultist: { - const bool fixRandomCultist = !cl_bloodvanillaenemies && (actor->spr.inittype >= kDudeBase) && (actor->spr.inittype < kDudeMax) && !VanillaMode(); // fix burning cultists randomly switching types underwater + const bool fixRandomCultist = !cl_bloodvanillaenemies && (actor->spr.inittype >= kDudeBase) && (actor->spr.inittype < kDudeMax) && (actor->spr.inittype != actor->spr.type) && !VanillaMode(); // fix burning cultists randomly switching types underwater if (Chance(chance)) actor->spr.type = kDudeCultistTommy; else diff --git a/source/games/blood/src/ai.cpp b/source/games/blood/src/ai.cpp index 1a65bb047..4211b7a86 100644 --- a/source/games/blood/src/ai.cpp +++ b/source/games/blood/src/ai.cpp @@ -1111,7 +1111,7 @@ int aiDamageSprite(DBloodActor* source, DBloodActor* actor, DAMAGE_TYPE nDmgType DUDEEXTRA* pDudeExtra = &actor->dudeExtra; pDudeExtra->teslaHit = 0; } - const bool fixRandomCultist = !cl_bloodvanillaenemies && (actor->spr.inittype >= kDudeBase) && (actor->spr.inittype < kDudeMax) && !VanillaMode(); // fix burning cultists randomly switching types underwater + const bool fixRandomCultist = !cl_bloodvanillaenemies && (actor->spr.inittype >= kDudeBase) && (actor->spr.inittype < kDudeMax) && (actor->spr.inittype != actor->spr.type) && !VanillaMode(); // fix burning cultists randomly switching types underwater switch (actor->spr.type) { case kDudeCultistTommy: