From c59c90e27b493f1c936fb49d78b4bcd13bfefaad Mon Sep 17 00:00:00 2001
From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com>
Date: Sun, 30 Jun 2024 00:03:03 +0530
Subject: [PATCH] ...

---
 src/MarbleGame.hx          | 2 +-
 src/gui/Canvas.hx          | 2 ++
 src/gui/TouchOptionsGui.hx | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/MarbleGame.hx b/src/MarbleGame.hx
index de0b0a80..6cf890e4 100644
--- a/src/MarbleGame.hx
+++ b/src/MarbleGame.hx
@@ -41,7 +41,7 @@ class MarbleGame {
 	static var canvas:Canvas;
 	static var instance:MarbleGame;
 
-	static var currentVersion = "1.1.2";
+	static var currentVersion = "1.1.3";
 
 	var world:MarbleWorld;
 	var previewWorld:PreviewWorld;
diff --git a/src/gui/Canvas.hx b/src/gui/Canvas.hx
index c6ce2f44..9f30f5c7 100644
--- a/src/gui/Canvas.hx
+++ b/src/gui/Canvas.hx
@@ -23,10 +23,12 @@ class Canvas extends GuiControl {
 		this.extent = new Vector(640, 480);
 		this.horizSizing = Width;
 		this.vertSizing = Height;
+		#if hl
 		Window.getInstance().addResizeEvent(() -> {
 			var wnd = Window.getInstance();
 			onResize(wnd.width, wnd.height);
 		});
+		#end
 	}
 
 	public function setContent(content:GuiControl) {
diff --git a/src/gui/TouchOptionsGui.hx b/src/gui/TouchOptionsGui.hx
index ca2b7127..f21b28e0 100644
--- a/src/gui/TouchOptionsGui.hx
+++ b/src/gui/TouchOptionsGui.hx
@@ -72,6 +72,12 @@ class TouchOptionsGui extends GuiImage {
 		}, 0.5, 118);
 		msOpt.setCurrentOption(Std.int(Util.clamp(Math.floor(((Settings.controlsSettings.cameraSensitivity - 0.2) / (3 - 0.2)) * 18), 0, 18)));
 
+		var dynamicJoystick = optionCollection.addOption(1, "Joystick Position", ["Fixed", "Dynamic"], (idx) -> {
+			Settings.touchSettings.dynamicJoystick = idx == 1;
+			return true;
+		}, 0.5, 118);
+		dynamicJoystick.setCurrentOption(Settings.touchSettings.dynamicJoystick ? 1 : 0);
+
 		var cameraMultiplier = optionCollection.addOption(1, "Button-Camera Factor", ["0.5", "1", "1.5", "2", "2.5", "3", "3.5"], (idx) -> {
 			Settings.touchSettings.buttonJoystickMultiplier = 0.5 + (idx * 0.5);
 			return true;