From b7479b567d8a9fb3b4f799a36630daeeeaf3680f Mon Sep 17 00:00:00 2001 From: CommonLoon102 <321850+CommonLoon102@users.noreply.github.com> Date: Sat, 21 Dec 2019 02:15:17 +0000 Subject: [PATCH] Revert tiny Caleb flameguy fix (#254) --- source/blood/src/ai.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source/blood/src/ai.cpp b/source/blood/src/ai.cpp index 75ab9ab5f..ab99b6e35 100644 --- a/source/blood/src/ai.cpp +++ b/source/blood/src/ai.cpp @@ -950,7 +950,7 @@ int aiDamageSprite(spritetype *pSprite, XSPRITE *pXSprite, int nSource, DAMAGE_T evKill(nSprite, 3, kCallbackFXFlameLick); } break; - case kDudeInnocent: // innocent + case kDudeInnocent: if (nDmgType == DAMAGE_TYPE_1 && pXSprite->health <= (unsigned int)pDudeInfo->fleeHealth/* && (pXSprite->at17_6 != 1 || pXSprite->at17_6 != 2)*/) { pSprite->type = kDudeBurningInnocent; @@ -993,12 +993,10 @@ int aiDamageSprite(spritetype *pSprite, XSPRITE *pXSprite, int nSource, DAMAGE_T evKill(nSprite, 3, kCallbackFXFlameLick); } break; - case kDudeTinyCaleb: // tiny Caleb + case kDudeTinyCaleb: if (nDmgType == DAMAGE_TYPE_1 && pXSprite->health <= (unsigned int)pDudeInfo->fleeHealth/* && (pXSprite->at17_6 != 1 || pXSprite->at17_6 != 2)*/) { pSprite->type = kDudeBurningInnocent; - if (!VanillaMode()) - pXSprite->scale = 64; aiNewState(pSprite, pXSprite, &cultistBurnGoto); aiPlay3DSound(pSprite, 361, AI_SFX_PRIORITY_0, -1); gDudeExtra[pSprite->extra].at0 = (int)gFrameClock+360;