mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-09-27 05:01:40 +00:00
Code Issues Releases Wiki Activity

multi::notremapped now takes remapped joystick buttons into account

Browse Source
This commit is contained in:
Zeno Rogue
2025-12-12 09:56:16 +01:00
parent 9c95d85bf4
commit ad28935a79
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multi.cpp
+11 -3
View File
@@ -623,10 +623,18 @@ EX int key_to_scan(int sym) {
} }
EX bool notremapped(int sym) { EX bool notremapped(int sym) {
int k;
auto& scfg = scfg_default; auto& scfg = scfg_default;
int sc = key_to_scan(sym); if(is_joy_any(sym)) {
if(sc < 0 || sc >= SCANCODES) return true; int joystick_id = gmod(gmod(sym, PSEUDOKEY_JOY) / JOY_ID, MAXJOY);
int k = scfg.keyaction[sc]; int button_id = gmod(gmod(sym, JOY_ID), MAXBUTTON);
k = scfg.joyaction[joystick_id][button_id];
}
else {
int sc = key_to_scan(sym);
if(sc < 0 || sc >= SCANCODES) return true;
k = scfg.keyaction[sc];
}
if(k == 0) return true; if(k == 0) return true;
k /= 16; k /= 16;
if(k > 3) k--; else if(k==3) k = 0; if(k > 3) k--; else if(k==3) k = 0;