mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-04 11:19:58 -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:
@@ -17,7 +17,10 @@
|
||||
#include "d/d_msg_scrn_explain.h"
|
||||
#include "m_Do/m_Do_graphic.h"
|
||||
#include "d/actor/d_a_midna.h"
|
||||
#if TARGET_PC
|
||||
#include "dusk/frame_interpolation.h"
|
||||
#include "dusk/ui/touch_controls.hpp"
|
||||
#endif
|
||||
#include <cstring>
|
||||
|
||||
#if TARGET_PC
|
||||
@@ -2509,6 +2512,10 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
|
||||
}
|
||||
|
||||
dMenu_Fmap2DTop_c::~dMenu_Fmap2DTop_c() {
|
||||
#if TARGET_PC
|
||||
dusk::ui::set_control_override(dusk::ui::Control::Z, dusk::ui::ControlOverride::Default);
|
||||
#endif
|
||||
|
||||
deleteExplain();
|
||||
JKR_DELETE(mpTitleScreen);
|
||||
mpTitleScreen = NULL;
|
||||
@@ -2782,6 +2789,12 @@ void dMenu_Fmap2DTop_c::setZButtonString(u32 param_0, u8 i_alpha) {
|
||||
param_0 = 0x533;
|
||||
}
|
||||
|
||||
#if TARGET_PC
|
||||
dusk::ui::set_control_override(dusk::ui::Control::Z,
|
||||
param_0 != 0 && isWarpAccept() ? dusk::ui::ControlOverride::Action :
|
||||
dusk::ui::ControlOverride::Default);
|
||||
#endif
|
||||
|
||||
#if VERSION == VERSION_GCN_JPN
|
||||
static const u64 cont_zt[5] = {MULTI_CHAR('cont_zt'), MULTI_CHAR('cont_zt1'), MULTI_CHAR('cont_zt2'), MULTI_CHAR('cont_zt3'), MULTI_CHAR('cont_zt4')};
|
||||
#define setZButtonString_font_zt cont_zt
|
||||
|
||||
Reference in New Issue
Block a user