Rumble cvar and fixes

libultraship/libultraship/Controller.h

@@ -19,6 +19,7 @@ namespace Ship {
 			void Read(OSContPad* pad);
 			virtual void ReadFromSource() = 0;
 			virtual void WriteToSource(ControllerCallback* controller) = 0;
+			virtual bool CanRumble() const = 0;
 			bool isRumbling;
 
 			void SetButtonMapping(const std::string& szButtonName, int32_t dwScancode);

libultraship/libultraship/GameSettings.cpp

@@ -87,6 +87,9 @@ namespace Game {
         Settings.controller.rumble_strength = Ship::stof(Conf[ControllerSection]["rumble_strength"]);
         CVar_SetFloat("gRumbleStrength", Settings.controller.rumble_strength);
 
+        Settings.controller.rumble_enabled = Ship::stof(Conf[ControllerSection]["rumble_enabled"]);
+        CVar_SetS32("gRumbleEnabled", Settings.controller.rumble_enabled);
+
         Settings.controller.input_scale = Ship::stof(Conf[ControllerSection]["input_scale"]);
         CVar_SetFloat("gInputScale", Settings.controller.input_scale);
 
@@ -160,6 +163,7 @@ namespace Game {
         // Controllers
         Conf[ControllerSection]["gyro_sensitivity"] = std::to_string(Settings.controller.gyro_sensitivity);
         Conf[ControllerSection]["rumble_strength"]  = std::to_string(Settings.controller.rumble_strength);
+        Conf[ControllerSection]["rumble_enabled"]  = std::to_string(Settings.controller.rumble_enabled);
         Conf[ControllerSection]["input_scale"]   = std::to_string(Settings.controller.input_scale);
         Conf[ControllerSection]["input_enabled"] = std::to_string(Settings.controller.input_enabled);
         Conf[ControllerSection]["dpad_pause_name"] = std::to_string(Settings.controller.dpad_pause_name);

libultraship/libultraship/GameSettings.h

@@ -31,6 +31,7 @@ struct SoHConfigType {
     struct {
         float gyro_sensitivity = 1.0f;
         float rumble_strength = 1.0f;
+        bool rumble_enabled = true;
         float input_scale = 1.0f;
         float gyroDriftX = 0.0f;
         float gyroDriftY = 0.0f;

libultraship/libultraship/KeyboardController.h

@@ -10,6 +10,7 @@ namespace Ship {
 
 			void ReadFromSource();
 			void WriteToSource(ControllerCallback* controller);
+			bool CanRumble() const { return false; }
 
 			bool PressButton(int32_t dwScancode);
 			bool ReleaseButton(int32_t dwScancode);

libultraship/libultraship/SDLController.cpp

@@ -93,6 +93,9 @@ namespace Ship {
     }
 
     bool SDLController::Close() {
+        if (SDL_GameControllerHasRumble(Cont)) {
+            SDL_GameControllerRumble(Cont, 0, 0, 0);
+        }
         if (Cont != nullptr) {
             SDL_GameControllerClose(Cont);
         }
@@ -331,7 +334,9 @@ namespace Ship {
     {
         if (SDL_GameControllerHasRumble(Cont)) {
             if (controller->rumble > 0) {
-                SDL_GameControllerRumble(Cont, 0xFFFF * Game::Settings.controller.rumble_strength, 0xFFFF * Game::Settings.controller.rumble_strength, 1);
+                SDL_GameControllerRumble(Cont, 0xFFFF * Game::Settings.controller.rumble_strength, 0xFFFF * Game::Settings.controller.rumble_strength, 0);
+            } else {
+                SDL_GameControllerRumble(Cont, 0, 0, 0);
             }
         }
 

libultraship/libultraship/SDLController.h

@@ -12,6 +12,7 @@ namespace Ship {
 
 			void ReadFromSource();
 			void WriteToSource(ControllerCallback* controller);
+			bool CanRumble() const { return SDL_GameControllerHasRumble(Cont); }
 
 			std::string GetGuid() { return guid; };
 

libultraship/libultraship/SohImGuiImpl.cpp

@@ -364,6 +364,11 @@ namespace SohImGui {
 
                 ImGui::Separator();
 
+                if (ImGui::Checkbox("Rumble Enabled", &Game::Settings.controller.rumble_enabled)) {
+                    CVar_SetS32("gRumbleEnabled", Game::Settings.controller.rumble_enabled);
+                    needs_save = true;
+                }
+
                 ImGui::Text("Rumble Strength: %d %%", static_cast<int>(100 * Game::Settings.controller.rumble_strength));
                 if (ImGui::SliderFloat("##RUMBLE", &Game::Settings.controller.rumble_strength, 0.0f, 1.0f, "")) {
                     needs_save = true;

soh/soh/Enhancements/bootcommands.c

@@ -25,6 +25,7 @@ void BootCommands_Init()
     CVar_RegisterS32("gDebugEnabled", 0);
     CVar_RegisterS32("gPauseLiveLink", 0);
     CVar_RegisterS32("gMinimalUI", 0);
+    CVar_RegisterS32("gRumbleEnabled", 0);
 }
 
 //void BootCommands_ParseBootArgs(char* str)

soh/soh/OTRGlobals.cpp

@@ -814,3 +814,13 @@ extern "C" void AudioPlayer_Play(const uint8_t* buf, uint32_t len) {
         OTRGlobals::Instance->context->GetWindow()->GetAudioPlayer()->Play(buf, len);
     }
 }
+
+extern "C" int Controller_CanRumble(void) {
+    for (const auto& controller : Ship::Window::Controllers.at(0)) {
+        if (controller->CanRumble()) {
+            return 1;
+        }
+    }
+
+    return 0;
+}

soh/soh/OTRGlobals.h

@@ -64,4 +64,5 @@ int AudioPlayer_Buffered(void);
 int AudioPlayer_GetDesiredBuffered(void);
 void AudioPlayer_Play(const uint8_t* buf, uint32_t len);
 void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples);
+int Controller_CanRumble(void);
 #endif

soh/soh/stubs.c

@@ -102,7 +102,7 @@ void osCreateViManager(OSPri pri)
 
 s32 osMotorInit(OSMesgQueue* ctrlrqueue, OSPfs* pfs, s32 channel)
 {
-
+    return 0;
 }
 
 u32 osAiGetLength(void)
@@ -2099,4 +2099,4 @@ u8 gSequenceFontTable[0x1C0] = {
     0x01, 0x12, 0x01, 0x24, 0x01, 0x18, 0x01, 0x19, 0x01, 0x13, 0x01, 0x20, 0x01, 0x1B, 0x01, 0x1C, 0x01, 0x1D, 0x01,
     0x03, 0x01, 0x1F, 0x01, 0x20, 0x01, 0x20, 0x01, 0x09, 0x01, 0x21, 0x01, 0x22, 0x01, 0x21, 0x01, 0x09, 0x01, 0x20,
     0x01, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
+};

soh/src/code/padmgr.c

@@ -269,7 +269,7 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) {
         input->press.stick_y += (s8)(input->cur.stick_y - input->prev.stick_y);
     }
 
-    controllerCallback.rumble = padMgr->rumbleEnable[0] > 0 ? 1 : 0;
+    controllerCallback.rumble = CVar_GetS32("gRumbleEnabled", 0) && (padMgr->rumbleEnable[0] > 0);
 
     if (HealthMeter_IsCritical()) {
         controllerCallback.ledColor = 0;
@@ -303,6 +303,9 @@ void PadMgr_HandleRetraceMsg(PadMgr* padMgr) {
     }
     osRecvMesg(queue, NULL, OS_MESG_BLOCK);
     osContGetReadData(padMgr->pads);
+
+    padMgr->padStatus[0].status = CVar_GetS32("gRumbleEnabled", 0) && Controller_CanRumble();
+
     if (padMgr->preNMIShutdown) {
         memset(padMgr->pads, 0, sizeof(padMgr->pads));
     }