summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraMannus <mannusmenting@gmail.com>2023-09-15 04:54:04 +0200
committerGitHub <noreply@github.com>2023-09-14 21:54:04 -0500
commitd32d8836f8a626ee5ecfdbbfc57be2557c31ab07 (patch)
tree91a77472f50cf0fd0d5627149b277307acfdd4f0
parent3235f88ef66e27d03cb188149681eadf3d8dca5d (diff)
Disable CC knockback while crawling (#3187)
-rw-r--r--soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp
index 0b8682ca6..7b725b487 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp
@@ -211,7 +211,8 @@ namespace GameInteractionEffect {
// MARK: - KnockbackPlayer
GameInteractionEffectQueryResult KnockbackPlayer::CanBeApplied() {
- if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused()) {
+ Player* player = GET_PLAYER(gPlayState);
+ if (!GameInteractor::IsSaveLoaded() || GameInteractor::IsGameplayPaused() || player->stateFlags2 & PLAYER_STATE2_CRAWLING) {
return GameInteractionEffectQueryResult::TemporarilyNotPossible;
} else {
return GameInteractionEffectQueryResult::Possible;