summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEblo <7004497+Eblo@users.noreply.github.com>2025-09-16 13:50:24 -0400
committerEblo <7004497+Eblo@users.noreply.github.com>2025-09-16 13:50:24 -0400
commit3004a246ff958b5b8429013f7e96e6e15ad35edd (patch)
treedcfdee0dd4558420027d1ff77337459a05133ca1
parent33d7acb2c5f3d86757a92d01aa47b60a19319852 (diff)
Update magic spin flag in GameInteractor.cpp
-rw-r--r--mm/2s2h/GameInteractor/GameInteractor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/2s2h/GameInteractor/GameInteractor.cpp b/mm/2s2h/GameInteractor/GameInteractor.cpp
index a731241a3..fe6cb7fb1 100644
--- a/mm/2s2h/GameInteractor/GameInteractor.cpp
+++ b/mm/2s2h/GameInteractor/GameInteractor.cpp
@@ -420,8 +420,8 @@ void ProcessEvents(Actor* actor) {
// If the player is climbing or in the air, deliver the item without a cutscene but freeze the player
if (!e->showGetItemCutscene ||
(player->stateFlags1 &
- (PLAYER_STATE1_1000 | PLAYER_STATE1_2000 | PLAYER_STATE1_4000 | PLAYER_STATE1_40000 | PLAYER_STATE1_80000 |
- PLAYER_STATE1_100000 | PLAYER_STATE1_200000 | PLAYER_STATE1_8000000)) ||
+ (PLAYER_STATE1_CHARGING_SPIN_ATTACK | PLAYER_STATE1_2000 | PLAYER_STATE1_4000 | PLAYER_STATE1_40000 |
+ PLAYER_STATE1_80000 | PLAYER_STATE1_100000 | PLAYER_STATE1_200000 | PLAYER_STATE1_8000000)) ||
(Player_GetExplosiveHeld(player) > PLAYER_EXPLOSIVE_NONE)) {
enItem00 = CustomItem::Spawn(
player->actor.world.pos.x, player->actor.world.pos.y, player->actor.world.pos.z, 0,