mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-11 13:08:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

More fixes for clawshot touch controls

Browse Source
This commit is contained in:
Luke Street
2026-06-16 13:37:04 -06:00
parent 0c9c8795ce
commit 1fd8a2ca3c
6 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dusk/ui/touch_controls.cpp
+2 -7
View File
@@ -156,11 +156,6 @@ bool player_attention_locked() noexcept {
return player != nullptr && (player->checkAttentionLock() || player->checkEnemyAttentionLock());
}
bool touch_aim_capture_active() noexcept {
auto* player = daAlink_getAlinkActorClass();
return player != nullptr && player->checkTouchAimCaptureContext() && dCamera_c::isAimActive();
}
bool item_wheel_active() noexcept {
return dMeter2Info_getWindowStatus() == 2;
}
@@ -697,7 +692,7 @@ void TouchControls::sync_touch_state() noexcept {
}
sync_l_lock_state();
const bool aimActive = touch_aim_capture_active();
const bool aimActive = dCamera_c::isAimActive();
if (aimActive && mMoveTouch.active) {
if (!mCameraTouch.active) {
mCameraTouch = mMoveTouch;
@@ -1213,7 +1208,7 @@ void TouchControls::handle_touch_down(Rml::Event& event) noexcept {
}
const auto id = touch_event_id(event);
if (touch_aim_capture_active()) {
if (dCamera_c::isAimActive()) {
if (!mCameraTouch.active) {
mCameraTouch = {
.id = id,