summaryrefslogtreecommitdiff
path: root/soh/src/code/padmgr.c
diff options
context:
space:
mode:
authorKiritoDev <36680385+KiritoDv@users.noreply.github.com>2022-07-13 22:12:11 -0500
committerGitHub <noreply@github.com>2022-07-13 23:12:11 -0400
commit219804cbe4e9d494f0152f40155115bb308002d4 (patch)
treebdf53087d58f947bdcd305c1d69a0d68ab6d60f9 /soh/src/code/padmgr.c
parentcb6876792e99f8420ca0626ac55a9b57c638bc13 (diff)
Controller Configuration UI and JSON Config (#760)
* Initial controller hud ui * Reverted fbdemo changes * Moved config to json and implemented controller config * fix build on linux, gitignore new config file * fix build * Fix compilation and file directory paths * Call save on cvar save * Fixed cvar loading and added deck slots to the config * Changed control deck port 0 to use a physical device by default * Added gyro and rumble & fixed loading errors * Save config on toggle menubar * fix linux build * Fixed drift calculation * Controller config now saves when pressing F1 * Removed ExitGame hook from ImGuiImpl * Moved mappings to a map * Added GetKeyName * untranslate scancodes * Fixed hud layout on keyboard device * Fixed keyboard read on hud * Fixed crash when reloading controllers * Removed ConfigFile and changed file extension * Changed Dummy to Disconnected and fixed filters * Removed function leftover * Changed ControllerHud to InputEditor Co-authored-by: briaguya <briaguya@alice> Co-authored-by: David Chavez <david@dcvz.io>
Diffstat (limited to 'soh/src/code/padmgr.c')
-rw-r--r--soh/src/code/padmgr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/soh/src/code/padmgr.c b/soh/src/code/padmgr.c
index d89207e6f..9bd9d53e7 100644
--- a/soh/src/code/padmgr.c
+++ b/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 = CVar_GetS32("gRumbleEnabled", 0) && (padMgr->rumbleEnable[0] > 0);
+ controllerCallback.rumble = (padMgr->rumbleEnable[0] > 0);
if (HealthMeter_IsCritical()) {
controllerCallback.ledColor = 0;