Removed DirectInputEffectsGain force feedback configuration parameter as it's not that useful as it's easier to adjust effects individually

This commit is contained in:
Nik Henson 2011-09-21 22:28:13 +00:00
parent 0528a4f0c6
commit b87f24cdf2
3 changed files with 1 additions and 5 deletions

View file

@ -412,7 +412,6 @@ static void ApplySettings(CINIFile *INI, const char *section)
#ifdef SUPERMODEL_WIN32 #ifdef SUPERMODEL_WIN32
// DirectInput ForceFeedback // DirectInput ForceFeedback
INI->Get(section, "DirectInputEffectsGain", g_Config.dInputEffectsGain);
INI->Get(section, "DirectInputConstForceMax", g_Config.dInputConstForceMax); INI->Get(section, "DirectInputConstForceMax", g_Config.dInputConstForceMax);
INI->Get(section, "DirectInputSelfCenterMax", g_Config.dInputSelfCenterMax); INI->Get(section, "DirectInputSelfCenterMax", g_Config.dInputSelfCenterMax);
INI->Get(section, "DirectInputFrictionMax", g_Config.dInputFrictionMax); INI->Get(section, "DirectInputFrictionMax", g_Config.dInputFrictionMax);
@ -456,7 +455,6 @@ static void LogConfig(void)
#ifdef SUPERMODEL_WIN32 #ifdef SUPERMODEL_WIN32
// DirectInput ForceFeedback // DirectInput ForceFeedback
InfoLog("\tDirectInputEffectsGain = %u", g_Config.dInputEffectsGain);
InfoLog("\tDirectInputConstForceMax = %u", g_Config.dInputConstForceMax); InfoLog("\tDirectInputConstForceMax = %u", g_Config.dInputConstForceMax);
InfoLog("\tDirectInputSelfCenterMax = %u", g_Config.dInputSelfCenterMax); InfoLog("\tDirectInputSelfCenterMax = %u", g_Config.dInputSelfCenterMax);
InfoLog("\tDirectInputFrictionMax = %u", g_Config.dInputFrictionMax); InfoLog("\tDirectInputFrictionMax = %u", g_Config.dInputFrictionMax);

View file

@ -54,7 +54,6 @@ public:
#endif #endif
#ifdef SUPERMODEL_WIN32 #ifdef SUPERMODEL_WIN32
unsigned dInputEffectsGain;
unsigned dInputConstForceMax; unsigned dInputConstForceMax;
unsigned dInputSelfCenterMax; unsigned dInputSelfCenterMax;
unsigned dInputFrictionMax; unsigned dInputFrictionMax;
@ -115,7 +114,6 @@ public:
#endif #endif
#ifdef SUPERMODEL_WIN32 #ifdef SUPERMODEL_WIN32
inputSystem = "dinput"; inputSystem = "dinput";
dInputEffectsGain = 100;
dInputConstForceMax = 100; dInputConstForceMax = 100;
dInputSelfCenterMax = 100; dInputSelfCenterMax = 100;
dInputFrictionMax = 100; dInputFrictionMax = 100;

View file

@ -1397,7 +1397,7 @@ HRESULT CDirectInputSystem::CreateJoystickEffect(LPDIRECTINPUTDEVICE8 joystick,
eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS;
eff.dwTriggerButton = DIEB_NOTRIGGER; eff.dwTriggerButton = DIEB_NOTRIGGER;
eff.dwTriggerRepeatInterval = 0; eff.dwTriggerRepeatInterval = 0;
eff.dwGain = min<LONG>(g_Config.dInputEffectsGain * DI_EFFECTS_SCALE, DI_EFFECTS_MAX); eff.dwGain = DI_FFNOMINALMAX;
eff.cAxes = 1; eff.cAxes = 1;
eff.rgdwAxes = &dwAxis; eff.rgdwAxes = &dwAxis;
eff.rglDirection = &lDirection; eff.rglDirection = &lDirection;