mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-19 14:30:29 -04:00
Touch controls (#2053)
* WIP touch controls * Action icons * Updates * Don't mutate freeCamera config; allow switching between touch and controller cam * Wow * Fix build & add Skip button * Fix build & add settings * RCSS cleanup * Dpad and fishing, might redo * Add menu mouse controls * More pointer & fix icons * Optimizations & introduce layout system * Update aurora * Implement touch controls layout editor * Cleanup & fixes * Allow disabling mouse/touch in menus * More fixes
This commit is contained in:
+18
-2
@@ -26,12 +26,13 @@
|
||||
#include <cstring>
|
||||
|
||||
#include "JSystem/JKernel/JKRExpHeap.h"
|
||||
#include "dusk/version.hpp"
|
||||
#include "m_Do/m_Do_controller_pad.h"
|
||||
#include "m_Do/m_Do_lib.h"
|
||||
|
||||
#if TARGET_PC
|
||||
#include "dusk/menu_pointer.h"
|
||||
#include "dusk/settings.h"
|
||||
#include "dusk/version.hpp"
|
||||
#include <vector>
|
||||
#include <array>
|
||||
#include <algorithm>
|
||||
@@ -1123,7 +1124,20 @@ void dMsgObject_c::selectProc() {
|
||||
dComIfGp_setAStatusForce(0x2a, 0);
|
||||
}
|
||||
}
|
||||
if (mDoCPd_c::getTrigA(0)) {
|
||||
#if TARGET_PC
|
||||
jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference();
|
||||
u8 pointerChoice = 0xFF;
|
||||
bool pointerConfirm = dusk::menu_pointer::consume_dialog_click(pointerChoice) &&
|
||||
pointerChoice < pRef->getSelectNum();
|
||||
if (pointerConfirm) {
|
||||
pRef->setSelectPos(pointerChoice);
|
||||
}
|
||||
#endif
|
||||
if (mDoCPd_c::getTrigA(0)
|
||||
#if TARGET_PC
|
||||
|| pointerConfirm
|
||||
#endif
|
||||
) {
|
||||
if (getSelectCursorPosLocal() != 0xff) {
|
||||
field_0x1a3 = 1;
|
||||
}
|
||||
@@ -1145,7 +1159,9 @@ void dMsgObject_c::selectProc() {
|
||||
}
|
||||
field_0x1a3 = 2;
|
||||
}
|
||||
#ifndef TARGET_PC
|
||||
jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference();
|
||||
#endif
|
||||
if (getStatusLocal() == 8) {
|
||||
if (isMidonaMessage() && field_0x1a3 != 0) {
|
||||
if (field_0x1a3 == 2 && getSelectCancelPos() == 3) {
|
||||
|
||||
Reference in New Issue
Block a user