diff --git a/source/games/blood/src/actor.cpp b/source/games/blood/src/actor.cpp index 68de40bef..7a49ab25a 100644 --- a/source/games/blood/src/actor.cpp +++ b/source/games/blood/src/actor.cpp @@ -4151,7 +4151,7 @@ static void checkCeilHit(DBloodActor* actor) actor2->spr.flags |= 5; #ifdef NOONE_EXTENSIONS // add size shroom abilities - if ((actor->IsPlayerActor() && isShrinked(actor)) || (actor2->IsPlayerActor() && isGrown(actor2))) { + if ((actor->IsPlayerActor() && isShrunk(actor)) || (actor2->IsPlayerActor() && isGrown(actor2))) { int mass1 = getDudeInfo(actor2->spr.type)->mass; int mass2 = getDudeInfo(actor->spr.type)->mass; @@ -4237,7 +4237,7 @@ static void checkHit(DBloodActor* actor) #ifdef NOONE_EXTENSIONS // add size shroom abilities - if ((actor2->IsPlayerActor() && isShrinked(actor2)) || (actor->IsPlayerActor() && isGrown(actor))) + if ((actor2->IsPlayerActor() && isShrunk(actor2)) || (actor->IsPlayerActor() && isGrown(actor))) { if (actor->vel.X != 0 && actor2->IsDudeActor()) { @@ -4310,7 +4310,7 @@ static void checkFloorHit(DBloodActor* actor) #ifdef NOONE_EXTENSIONS // add size shroom abilities - if ((actor2->IsPlayerActor() && isShrinked(actor2)) || (actor->IsPlayerActor() && isGrown(actor))) + if ((actor2->IsPlayerActor() && isShrunk(actor2)) || (actor->IsPlayerActor() && isGrown(actor))) { int mass1 = getDudeInfo(actor->spr.type)->mass; @@ -4402,7 +4402,7 @@ static void checkFloorHit(DBloodActor* actor) case kDudePlayer7: case kDudePlayer8: #ifdef NOONE_EXTENSIONS - if (pPlayer && !isShrinked(actor)) + if (pPlayer && !isShrunk(actor)) #else if (pPlayer) #endif diff --git a/source/games/blood/src/nnexts.cpp b/source/games/blood/src/nnexts.cpp index 120d6cfdf..9f571e124 100644 --- a/source/games/blood/src/nnexts.cpp +++ b/source/games/blood/src/nnexts.cpp @@ -4374,7 +4374,7 @@ bool condCheckPlayer(DBloodActor* aCond, int cmpOp, bool PUSH) case 14: return condCmp(pPlayer->posture + 1, arg1, arg2, cmpOp); case 46: return condCmp(pPlayer->sceneQav, arg1, arg2, cmpOp); case 47: return (pPlayer->godMode || powerupCheck(pPlayer, kPwUpDeathMask)); - case 48: return isShrinked(pPlayer->GetActor()); + case 48: return isShrunk(pPlayer->GetActor()); case 49: return isGrown(pPlayer->GetActor()); } @@ -7478,7 +7478,7 @@ bool isGrown(DBloodActor* actor) else return false; } -bool isShrinked(DBloodActor* actor) +bool isShrunk(DBloodActor* actor) { if (powerupCheck(getPlayer(actor->spr.type - kDudePlayer1), kPwUpShrinkShroom) > 0) return true; else if (actor->hasX() && actor->xspr.scale > 0 && actor->xspr.scale <= 128) return true; diff --git a/source/games/blood/src/nnexts.h b/source/games/blood/src/nnexts.h index e5380ec1a..0ef96f96d 100644 --- a/source/games/blood/src/nnexts.h +++ b/source/games/blood/src/nnexts.h @@ -357,7 +357,7 @@ void callbackGenDudeUpdate(DBloodActor* actor, sectortype* nSprite); // ------------------------------------------------------------------------- // DBloodPlayer* getPlayerById(int id); bool isGrown(DBloodActor* pSprite); -bool isShrinked(DBloodActor* pSprite); +bool isShrunk(DBloodActor* pSprite); bool IsBurningDude(DBloodActor* pSprite); bool IsKillableDude(DBloodActor* pSprite); bool isActive(DBloodActor* nSprite); diff --git a/source/games/blood/src/player.cpp b/source/games/blood/src/player.cpp index 80833d91c..a72ea572c 100644 --- a/source/games/blood/src/player.cpp +++ b/source/games/blood/src/player.cpp @@ -295,7 +295,7 @@ bool powerupActivate(DBloodPlayer* pPlayer, int nPowerUp) break; case kItemShroomGrow: if (!gModernMap) break; - else if (isShrinked(pPlayer->GetActor())) playerDeactivateShrooms(pPlayer); + else if (isShrunk(pPlayer->GetActor())) playerDeactivateShrooms(pPlayer); else { playerSizeGrow(pPlayer, 2); if (powerupCheck(getPlayer(pPlayer->GetActor()->spr.type - kDudePlayer1), kPwUpShadowCloak) > 0) { @@ -1041,7 +1041,7 @@ bool PickupItem(DBloodPlayer* pPlayer, DBloodActor* itemactor) if (gModernMap) { switch (itemactor->spr.type) { case kItemShroomShrink: - if (isShrinked(pPlayer->GetActor())) return false; + if (isShrunk(pPlayer->GetActor())) return false; break; case kItemShroomGrow: if (isGrown(pPlayer->GetActor())) return false;