Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust arrow checks to allow swapping if arrow is just in hand and not Z Targeting. #29

Merged
merged 1 commit into from
Feb 7, 2024
+5 −2
Merged

Adjust arrow checks to allow swapping if arrow is just in hand and not Z Targeting. #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/source/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 4 additions & 1 deletion code/source/rnd/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,10 @@ 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;
Expand Down
Loading