Merge branch 'develop' of https://github.com/HarbourMasters/Shipwright …

…into rando-custom-messages
lilDavid · Jul 14, 2022 · 9c57ed6 · 9c57ed6
2 parents cd096ce + 8417db6
commit 9c57ed6
Show file tree

Hide file tree

Showing 13 changed files with 72 additions and 353 deletions.
diff --git a/libultraship/libultraship/ControlDeck.cpp b/libultraship/libultraship/ControlDeck.cpp
@@ -89,15 +89,10 @@ void Ship::ControlDeck::LoadControllerSettings() {
 
 			profile.Mappings.clear();
 			profile.Thresholds.clear();
-			profile.GyroThresholds.clear();
 			profile.UseRumble = Config->getBool(NESTED("Rumble.Enabled", ""));
-			profile.RumbleStrength = Config->getBool(NESTED("Rumble.Strength", ""));
+			profile.RumbleStrength = Config->getFloat(NESTED("Rumble.Strength", ""));
 			profile.UseGyro = Config->getBool(NESTED("Gyro.Enabled", ""));
 
-			for (auto const& val : rawProfile["Gyro"]["Thresholds"].items()) {
-				profile.GyroThresholds[std::stoi(val.key())] = val.value();
-			}
-
 			for (auto const& val : rawProfile["Thresholds"].items()) {
 				profile.Thresholds[static_cast<ControllerThresholds>(std::stoi(val.key()))] = val.value();
 			}
@@ -135,12 +130,8 @@ void Ship::ControlDeck::SaveControllerSettings() {
 				Config->setInt(NESTED("Mappings.%s", val.key().c_str()), -1);
 			}
 
-			for (auto const& [key, val] : profile.GyroThresholds) {
-				Config->setInt(NESTED("Gyro.Thresholds.%d", key), val);
-			}
-
 			for (auto const& [key, val] : profile.Thresholds) {
-				Config->setInt(NESTED("Thresholds.%d", key), val);
+				Config->setFloat(NESTED("Thresholds.%d", key), val);
 			}
 
 			for (auto const& [key, val] : profile.Mappings) {
@@ -152,4 +143,4 @@ void Ship::ControlDeck::SaveControllerSettings() {
 	}
 
 	Config->save();
-}
+}
diff --git a/libultraship/libultraship/Controller.cpp b/libultraship/libultraship/Controller.cpp
@@ -26,52 +26,45 @@ namespace Ship {
 		pad->button |= dwPressedButtons[slot] & 0xFFFF;
 
 		// Stick Inputs
-		if (pad->stick_x == 0) {
+		if (wStickX == 0) {
 			if (dwPressedButtons[slot] & BTN_STICKLEFT) {
 				pad->stick_x = -128;
-			}
-			else if (dwPressedButtons[slot] & BTN_STICKRIGHT) {
+			} else if (dwPressedButtons[slot] & BTN_STICKRIGHT) {
 				pad->stick_x = 127;
 			}
-			else {
-				pad->stick_x = wStickX;
-			}
+		} else {
+			pad->stick_x = wStickX;
 		}
 
-		if (pad->stick_y == 0) {
+		if (wStickY == 0) {
 			if (dwPressedButtons[slot] & BTN_STICKDOWN) {
 				pad->stick_y = -128;
-			}
-			else if (dwPressedButtons[slot] & BTN_STICKUP) {
+			} else if (dwPressedButtons[slot] & BTN_STICKUP) {
 				pad->stick_y = 127;
 			}
-			else {
-				pad->stick_y = wStickY;
-			}
+		} else {
+			pad->stick_y = wStickY;
 		}
 
 		// Stick Inputs
-		if (pad->cam_x == 0) {
+		if (wCamX == 0) {
 			if (dwPressedButtons[slot] & BTN_VSTICKLEFT) {
 				pad->cam_x = -128 * 10.0f;
-			}
-			else if (dwPressedButtons[slot] & BTN_VSTICKRIGHT) {
+			} else if (dwPressedButtons[slot] & BTN_VSTICKRIGHT) {
 				pad->cam_x = 127 * 10.0f;
 			}
-			else {
-				pad->cam_x = wCamX;
-			}
+		} else {
+			pad->cam_x = wCamX;
 		}
-		if (pad->cam_y == 0) {
+
+		if (wCamY == 0) {
 			if (dwPressedButtons[slot] & BTN_VSTICKDOWN) {
 				pad->cam_y = -128 * 10.0f;
-			}
-			else if (dwPressedButtons[slot] & BTN_VSTICKUP) {
+			} else if (dwPressedButtons[slot] & BTN_VSTICKUP) {
 				pad->cam_y = 127 * 10.0f;
 			}
-			else {
-				pad->cam_y = wCamY;
-			}
+		} else {
+			pad->cam_y = wCamY;
 		}
 
 		// Gyro

diff --git a/libultraship/libultraship/Controller.h b/libultraship/libultraship/Controller.h
@@ -29,8 +29,7 @@ namespace Ship {
 		bool UseRumble = false;
 		bool UseGyro = false;
 		float RumbleStrength = 1.0f;
-		std::unordered_map<ControllerThresholds, int32_t> Thresholds;
-		std::unordered_map<int32_t, int32_t> GyroThresholds;
+		std::unordered_map<ControllerThresholds, float> Thresholds;
 		std::map<int32_t, int32_t> Mappings;
 	};
 

diff --git a/libultraship/libultraship/ControllerHud.cpp b/libultraship/libultraship/ControllerHud.cpp