This commit is contained in:
UnknownShadow200 2024-05-25 16:42:53 +10:00
parent 02c7ae5da7
commit 9d0f87abd7
2 changed files with 5 additions and 5 deletions

View file

@ -553,7 +553,7 @@ static void TouchScreen_BindClick(void* screen, void* widget) {
struct ButtonWidget* btn = (struct ButtonWidget*)widget;
int i = btn->meta.val;
Input_Set(KeyBind_Mappings[s->descs[i].bind], true);
Input_Set(KeyBind_Mappings[s->descs[i].bind].button1, true);
}
static const struct TouchButtonDesc onscreenDescs[ONSCREEN_MAX_BTNS] = {
@ -694,7 +694,7 @@ static void TouchScreen_PointerUp(void* screen, int id, int x, int y) {
if (!(s->btns[i].active & id)) continue;
if (s->descs[i].bind < BIND_COUNT) {
Input_Set(KeyBind_Mappings[s->descs[i].bind], false);
Input_Set(KeyBind_Mappings[s->descs[i].bind].button1, false);
}
s->btns[i].active &= ~id;
return;

View file

@ -333,14 +333,14 @@ static void ProcessNunchuck_Game(int port, int mods, float delta) {
Gamepad_SetButton(port, CCPAD_START, mods & WPAD_BUTTON_HOME);
Gamepad_SetButton(port, CCPAD_SELECT, mods & WPAD_BUTTON_MINUS);
Input_SetNonRepeatable(KeyBind_Mappings[BIND_FLY], mods & WPAD_BUTTON_LEFT);
Input_SetNonRepeatable(KeyBind_Mappings[BIND_FLY].button1, mods & WPAD_BUTTON_LEFT);
if (mods & WPAD_BUTTON_RIGHT) {
Mouse_ScrollVWheel(1.0*delta);
}
Input_SetNonRepeatable(KeyBind_Mappings[BIND_THIRD_PERSON], mods & WPAD_BUTTON_UP);
Input_SetNonRepeatable(KeyBind_Mappings[BIND_FLY_DOWN], mods & WPAD_BUTTON_DOWN);
Input_SetNonRepeatable(KeyBind_Mappings[BIND_THIRD_PERSON].button1, mods & WPAD_BUTTON_UP);
Input_SetNonRepeatable(KeyBind_Mappings[BIND_FLY_DOWN].button1, mods & WPAD_BUTTON_DOWN);
const float ANGLE_DELTA = 50;
bool nunchuckUp = (analog.ang > -ANGLE_DELTA) && (analog.ang < ANGLE_DELTA) && (analog.mag > 0.5);