thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2026-04-26 12:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Control remap fixes

Browse source
This commit is contained in:
Terry Hearst 2023-02-07 23:49:28 -05:00
parent 433bb9baaa
commit b53fe858d7
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gui/OptionsDlg.hx
View file

@ -328,6 +328,9 @@ class OptionsDlg extends GuiImage {
remapDlg.remapCallback = (key) -> { remapDlg.remapCallback = (key) -> {
MarbleGame.canvas.popDialog(remapDlg); MarbleGame.canvas.popDialog(remapDlg);
if (key == Key.ESCAPE)
return;
var conflicting = getConflictingBinding(bindingName, key); var conflicting = getConflictingBinding(bindingName, key);
if (conflicting == null) { if (conflicting == null) {
ctrl.txtCtrl.text.text = Util.getKeyForButton2(key); ctrl.txtCtrl.text.text = Util.getKeyForButton2(key);

4
src/gui/RemapDlg.hx
View file

@ -43,9 +43,9 @@ class RemapDlg extends GuiControl {
public override function update(dt:Float, mouseState:MouseState) { public override function update(dt:Float, mouseState:MouseState) {
super.update(dt, mouseState); super.update(dt, mouseState);
for (i in 0...1024) { for (i in 0...1024) {
if (i == 5) if (i == Key.MOUSE_WHEEL_DOWN || i == Key.MOUSE_WHEEL_UP)
continue; continue;
if (Key.isDown(i)) { if (Key.isPressed(i)) {
remapCallback(i); remapCallback(i);
} }
} }