Adjust arrow checks to allow swapping if arrow is just in hand and no…

…t Z Targeting.
Z3DR · Feb 7, 2024 · 83b6b95 · 83b6b95
1 parent 9a57947
commit 83b6b95
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/code/source/main.cpp b/code/source/main.cpp
@@ -102,7 +102,7 @@ namespace rnd {
 #if defined ENABLE_DEBUG || defined DEBUG_PRINT
     auto* saveData = GetContext().gctx->GetPlayerActor();
     if (newButtons == (u32)game::pad::Button::ZR)
-      rnd::util::Print("%s: Player held item is %#04x\n", __func__, saveData->held_item);
+      rnd::util::Print("%s: Flag is %#08x\n", __func__, saveData->flags1);
 #endif
     if (gSettingsContext.customMaskButton != 0 && pressedButtons == gSettingsContext.customMaskButton) {
       game::ui::OpenScreen(game::ui::ScreenType::Masks);

diff --git a/code/source/rnd/settings.cpp b/code/source/rnd/settings.cpp
@@ -113,7 +113,9 @@ namespace rnd {
       return gSettingsContext.enableFastMaskTransform;
     } else if ((gSettingsContext.enableFastMaskTransform &&
                 player->flags1.IsSet(game::act::Player::Flag1::FirstPersonMode)) ||
-               (player->held_item >= game::ItemId::Arrow && player->held_item <= game::ItemId::LightArrow))
+               (player->held_item >= game::ItemId::Arrow && player->held_item <= game::ItemId::LightArrow &&
+               (player->flags1.IsSet(game::act::Player::Flag1::ZTargeting) || player->flags1.IsSet(game::act::Player::Flag1::ZTargetingWithoutTarget) ||
+               player->flags1.IsSet(game::act::Player::Flag1::ZTargetingWithTarget))))
       return 0x00;
     else {
       return gSettingsContext.enableFastMaskTransform;