From 923dab2c228a8704d8a543f3023bfdb576ddea9d Mon Sep 17 00:00:00 2001
From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com>
Date: Tue, 4 Jun 2024 00:47:32 +0530
Subject: [PATCH] input fixes

---
 src/CameraController.hx    | 4 ++--
 src/gui/InputOptionsGui.hx | 4 ++--
 src/net/Net.hx             | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/CameraController.hx b/src/CameraController.hx
index 8ff3031c..6ba66265 100644
--- a/src/CameraController.hx
+++ b/src/CameraController.hx
@@ -135,7 +135,7 @@ class CameraController extends Object {
 		}
 
 		var factor = isTouch ? Util.lerp(1 / 25, 1 / 15,
-			Settings.controlsSettings.cameraSensitivity) : Util.lerp(1 / 2500, 1 / 100, Settings.controlsSettings.cameraSensitivity);
+			Settings.controlsSettings.cameraSensitivity) : Util.lerp(1 / 10000, 1 / 100, Settings.controlsSettings.cameraSensitivity);
 
 		if (!Settings.controlsSettings.alwaysFreeLook && !Key.isDown(Settings.controlsSettings.freelook) && !isTouch) {
 			deltaposY = 0;
@@ -239,7 +239,7 @@ class CameraController extends Object {
 		var cameraPitchDelta = (Key.isDown(Settings.controlsSettings.camBackward) ? 1 : 0)
 			- (Key.isDown(Settings.controlsSettings.camForward) ? 1 : 0)
 			+ gamepadY;
-		if (Settings.gamepadSettings.invertYAxis)
+		if (Settings.gamepadSettings.invertYAxis || Settings.controlsSettings.invertYAxis)
 			cameraPitchDelta = -cameraPitchDelta;
 		var cameraYawDelta = (Key.isDown(Settings.controlsSettings.camRight) ? 1 : 0) - (Key.isDown(Settings.controlsSettings.camLeft) ? 1 : 0) + gamepadX;
 		if (Settings.gamepadSettings.invertXAxis)
diff --git a/src/gui/InputOptionsGui.hx b/src/gui/InputOptionsGui.hx
index c42ffe11..7f290755 100644
--- a/src/gui/InputOptionsGui.hx
+++ b/src/gui/InputOptionsGui.hx
@@ -108,10 +108,10 @@ class InputOptionsGui extends GuiImage {
 		clOpt.setCurrentOption(Settings.controlsSettings.controllerVerticalCenter ? 1 : 0);
 
 		var msOpt = optionCollection.addOption(1, "Mouse Sensitivity", numberRange(10, 100, 5), (idx) -> {
-			Settings.controlsSettings.cameraSensitivity = cast(0.2 + (idx / 18.0) * (3 - 0.2));
+			Settings.controlsSettings.cameraSensitivity = cast(0.12 + (idx / 18.0) * (1.2 - 0.12));
 			return true;
 		}, 0.5, 118);
-		msOpt.setCurrentOption(Std.int(Util.clamp(Math.floor(((Settings.controlsSettings.cameraSensitivity - 0.2) / (3 - 0.2)) * 18), 0, 18)));
+		msOpt.setCurrentOption(Std.int(Util.clamp(Math.floor(((Settings.controlsSettings.cameraSensitivity - 0.12) / (1.2 - 0.12)) * 18), 0, 18)));
 
 		var bottomBar = new GuiControl();
 		bottomBar.position = new Vector(0, 590);
diff --git a/src/net/Net.hx b/src/net/Net.hx
index d8f5333b..da4ff059 100644
--- a/src/net/Net.hx
+++ b/src/net/Net.hx
@@ -279,9 +279,11 @@ class Net {
 			var onDatachannelOpen = (idx:Int) -> {
 				openFlags |= idx;
 				if (openFlags == 3) {
-					var loadGui:MultiplayerLoadingGui = cast MarbleGame.canvas.content;
-					if (loadGui != null) {
-						loadGui.setLoadingStatus("Handshaking");
+					if (MarbleGame.canvas.content is MultiplayerLoadingGui) {
+						var loadGui:MultiplayerLoadingGui = cast MarbleGame.canvas.content;
+						if (loadGui != null) {
+							loadGui.setLoadingStatus("Handshaking");
+						}
 					}
 					Console.log("Successfully connected!");
 					clients.set(client, new ClientConnection(0, client, clientDatachannel, clientDatachannelUnreliable)); // host is always 0