diff --git a/src/Settings.hx b/src/Settings.hx index 22aef056..86760215 100644 --- a/src/Settings.hx +++ b/src/Settings.hx @@ -127,7 +127,7 @@ class Settings { jumpButtonSize: 60, powerupButtonPos: [440, 180], powerupButtonSize: 60, - rewindButtonPos: [380, 240], + rewindButtonPos: [300, 100], rewindButtonSize: 60, buttonJoystickMultiplier: 2.5 } diff --git a/src/gui/OptionsDlg.hx b/src/gui/OptionsDlg.hx index 7f4a6a45..c4e721ef 100644 --- a/src/gui/OptionsDlg.hx +++ b/src/gui/OptionsDlg.hx @@ -404,6 +404,9 @@ Extensions: EAX 2.0, EAX 3.0, EAX Unified, and EAX-AC3"; } function remapFunc(bindingName:String, bindingFunc:Int->Void, ctrl:GuiButtonText) { + #if android + return; // Don't + #end var remapDlg = new RemapDlg(bindingName); MarbleGame.canvas.pushDialog(remapDlg); remapDlg.remapCallback = (key) -> { diff --git a/src/gui/TouchCtrlsEditGui.hx b/src/gui/TouchCtrlsEditGui.hx index ef6747ba..50812e4b 100644 --- a/src/gui/TouchCtrlsEditGui.hx +++ b/src/gui/TouchCtrlsEditGui.hx @@ -82,6 +82,18 @@ class TouchCtrlsEditGui extends GuiImage { Settings.touchSettings.powerupButtonSize = rvalue; } + rewindBtn.onClick = (sender, mousePos) -> { + sender.setSelected(true); + jumpBtn.setSelected(false); + powerupBtn.setSelected(false); + joystick.setSelected(false); + } + + rewindBtn.onChangeCb = (sender, value, rvalue) -> { + Settings.touchSettings.rewindButtonPos = [value.x, value.y]; + Settings.touchSettings.rewindButtonSize = rvalue; + } + joystick.onClick = (mousePos) -> { joystick.setSelected(true); jumpBtn.setSelected(false);