diff --git a/Src/OSD/SDL/Main.cpp b/Src/OSD/SDL/Main.cpp index 589434d..d560c0c 100644 --- a/Src/OSD/SDL/Main.cpp +++ b/Src/OSD/SDL/Main.cpp @@ -412,7 +412,6 @@ static void ApplySettings(CINIFile *INI, const char *section) #ifdef SUPERMODEL_WIN32 // DirectInput ForceFeedback - INI->Get(section, "DirectInputEffectsGain", g_Config.dInputEffectsGain); INI->Get(section, "DirectInputConstForceMax", g_Config.dInputConstForceMax); INI->Get(section, "DirectInputSelfCenterMax", g_Config.dInputSelfCenterMax); INI->Get(section, "DirectInputFrictionMax", g_Config.dInputFrictionMax); @@ -456,7 +455,6 @@ static void LogConfig(void) #ifdef SUPERMODEL_WIN32 // DirectInput ForceFeedback - InfoLog("\tDirectInputEffectsGain = %u", g_Config.dInputEffectsGain); InfoLog("\tDirectInputConstForceMax = %u", g_Config.dInputConstForceMax); InfoLog("\tDirectInputSelfCenterMax = %u", g_Config.dInputSelfCenterMax); InfoLog("\tDirectInputFrictionMax = %u", g_Config.dInputFrictionMax); diff --git a/Src/OSD/SDL/OSDConfig.h b/Src/OSD/SDL/OSDConfig.h index 99ea105..6f91fc1 100644 --- a/Src/OSD/SDL/OSDConfig.h +++ b/Src/OSD/SDL/OSDConfig.h @@ -54,7 +54,6 @@ public: #endif #ifdef SUPERMODEL_WIN32 - unsigned dInputEffectsGain; unsigned dInputConstForceMax; unsigned dInputSelfCenterMax; unsigned dInputFrictionMax; @@ -115,7 +114,6 @@ public: #endif #ifdef SUPERMODEL_WIN32 inputSystem = "dinput"; - dInputEffectsGain = 100; dInputConstForceMax = 100; dInputSelfCenterMax = 100; dInputFrictionMax = 100; diff --git a/Src/OSD/Windows/DirectInputSystem.cpp b/Src/OSD/Windows/DirectInputSystem.cpp index 8c873c5..019a4b9 100644 --- a/Src/OSD/Windows/DirectInputSystem.cpp +++ b/Src/OSD/Windows/DirectInputSystem.cpp @@ -1397,7 +1397,7 @@ HRESULT CDirectInputSystem::CreateJoystickEffect(LPDIRECTINPUTDEVICE8 joystick, eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; eff.dwTriggerButton = DIEB_NOTRIGGER; eff.dwTriggerRepeatInterval = 0; - eff.dwGain = min(g_Config.dInputEffectsGain * DI_EFFECTS_SCALE, DI_EFFECTS_MAX); + eff.dwGain = DI_FFNOMINALMAX; eff.cAxes = 1; eff.rgdwAxes = &dwAxis; eff.rglDirection = &lDirection;