From ddeb93a66dd2245869987c128ad30fa40b89f15b Mon Sep 17 00:00:00 2001 From: Aaron M Date: Wed, 30 Oct 2019 19:03:50 +1300 Subject: [PATCH] Changed all rumble to use New Rumble compared to old LeftRight --- Common Files/Game.h | 1 + DllMain.cpp | 45 ++++- Game Files/AfterburnerClimax.cpp | 4 +- Game Files/BG4JP.cpp | 8 +- Game Files/ButtonRumble.cpp | 16 +- Game Files/ChaseHQ2.cpp | 4 +- Game Files/Daytona3.cpp | 4 +- Game Files/Demul.cpp | 8 +- Game Files/FordRacing.cpp | 4 +- Game Files/FordRacingOther.cpp | 4 +- Game Files/GRID.cpp | 12 +- Game Files/GTIClub3.cpp | 12 +- Game Files/HOTD4.cpp | 48 +++--- Game Files/InitialD4.cpp | 10 +- Game Files/InitialD4Japan.cpp | 10 +- Game Files/InitialD5.cpp | 10 +- Game Files/InitialD6.cpp | 12 +- Game Files/InitialD7.cpp | 12 +- Game Files/InitialD8.cpp | 12 +- Game Files/KODrive.cpp | 10 +- Game Files/LGI.cpp | 60 +++---- Game Files/LGI3D.cpp | 84 +++++----- Game Files/M2Emulator.cpp | 160 +++++++++--------- Game Files/Machstorm.cpp | 40 ++--- Game Files/Mame0199.cpp | 224 ++++++++++++------------- Game Files/Mame0206.cpp | 224 ++++++++++++------------- Game Files/MarioKartGPDX.cpp | 16 +- Game Files/MarioKartGPDX1.10.cpp | 38 ++--- Game Files/OutRun2Fake.cpp | 32 ++-- Game Files/OutRun2Real.cpp | 8 +- Game Files/PokkenTournament.cpp | 6 +- Game Files/RoadFighters3D.cpp | 12 +- Game Files/SegaRacingClassic.cpp | 8 +- Game Files/SegaRally3.cpp | 4 +- Game Files/SonicSegaAllStarsRacing.cpp | 4 +- Game Files/TestGame.cpp | 2 +- Game Files/WMMT5.cpp | 18 +- Game Files/WackyRaces.cpp | 4 +- 38 files changed, 617 insertions(+), 573 deletions(-) diff --git a/Common Files/Game.h b/Common Files/Game.h index 85a8d27..e7bcc5c 100644 --- a/Common Files/Game.h +++ b/Common Files/Game.h @@ -7,6 +7,7 @@ struct EffectTriggers { void(*Friction)(double strength); void(*Sine)(UINT16 period, UINT16 fadePeriod, double strength); void(*Rumble)(double lowfrequency, double highfrequency, double length); + void(*RumbleDevice2)(double lowfrequency, double highfrequency, double length); void(*LeftRight)(double smallstrength, double largestrength, double length); void(*LeftRightDevice2)(double smallstrength, double largestrength, double length); void(*Springi)(double strength); diff --git a/DllMain.cpp b/DllMain.cpp index 3cf7ddf..b4faf66 100644 --- a/DllMain.cpp +++ b/DllMain.cpp @@ -1589,6 +1589,29 @@ void TriggerRumbleEffect(double lowfrequency, double highfrequency, double lengt } } +void TriggerRumbleEffectDevice2(double lowfrequency, double highfrequency, double length) +{ + if (EnableRumble == 1) + { + DWORD minForceLow = (DWORD)(lowfrequency > 0.001 ? (configMinForce / 100.0 * 65535.0) : 0); + DWORD minForceHigh = (DWORD)(highfrequency > 0.001 ? (configMinForce / 100.0 * 65535.0) : 0); + DWORD maxForce = (DWORD)(configMaxForce / 100.0 * 65535.0); + DWORD rangeLow = maxForce - minForceLow; + DWORD rangeHigh = maxForce - minForceHigh; + DWORD LowMotor = (DWORD)(lowfrequency * rangeLow + minForceLow); + DWORD HighMotor = (DWORD)(highfrequency * rangeHigh + minForceHigh); + + if (ReverseRumble == 1) + { + SDL_JoystickRumble(GameController2, HighMotor, LowMotor, length); + } + else + { + SDL_JoystickRumble(GameController2, LowMotor, HighMotor, length); + } + } +} + void TriggerSpringEffect(double strength) { TriggerSpringEffectWithDefaultOption(strength, false); @@ -1630,6 +1653,7 @@ DWORD WINAPI FFBLoop(LPVOID lpParam) t.Friction = &TriggerFrictionEffect; t.Sine = &TriggerSineEffect; t.Rumble = &TriggerRumbleEffect; + t.RumbleDevice2 = &TriggerRumbleEffectDevice2; t.LeftRight = &TriggerLeftRightEffect; t.LeftRightDevice2 = &TriggerLeftRightDevice2Effect; t.Springi = &TriggerSpringEffectInfinite; @@ -2598,9 +2622,28 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ulReasonForCall, LPVOID lpReserved) FreeLibrary(gl_hlibavs); } + if (GameController) + { + if (EnableRumble == 1) + { + SDL_JoystickRumble(GameController, 0, 0, 0); + } + } + + if (GameController2) + { + if (EnableRumble == 1) + { + SDL_JoystickRumble(GameController2, 0, 0, 0); + } + } + // this doesn't seem to really work...hmm...if i ALT+F4, then the program quits and haptic is still set. // try setting GameId to HEAVY (-5 or -6..can't remember) and then force quit. Wheel will stay heavy :/. - if (haptic) { + if (haptic) + { + + SDL_JoystickRumble(GameController2, 0, 0, 0); SDL_HapticStopEffect(haptic, effects.effect_constant_id); SDL_HapticStopEffect(haptic, effects.effect_friction_id); SDL_HapticStopEffect(haptic, effects.effect_leftright_id); diff --git a/Game Files/AfterburnerClimax.cpp b/Game Files/AfterburnerClimax.cpp index 317399a..f356537 100644 --- a/Game Files/AfterburnerClimax.cpp +++ b/Game Files/AfterburnerClimax.cpp @@ -31,12 +31,12 @@ void AfterburnerClimax::FFBLoop(EffectConstants *constants, Helpers *helpers, Ef { double percentForce = ((Rumble1Strength) / 100.0); double percentLength = (Rumble1Length); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (ff == 80) { double percentForce = ((Rumble2Strength) / 100.0); double percentLength = (Rumble2Length); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } } \ No newline at end of file diff --git a/Game Files/BG4JP.cpp b/Game Files/BG4JP.cpp index 5697ec1..d8230b0 100644 --- a/Game Files/BG4JP.cpp +++ b/Game Files/BG4JP.cpp @@ -68,28 +68,28 @@ void BG4JP::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers { double percentForce = SpeedStrength / 100.0; double percentLength = 150; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((1000000 < ff) && (ff < 1600000)) { double percentForce = SpeedStrength / 100.0; double percentLength = 150; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((0.00000000000000000001 < ff2) && (ffspeed > 0.01)) { double percentForce = (0.1); double percentLength = (50); - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((0.00000000000000000001 > ff2) && (ffspeed > 0.01)) { double percentForce = (0.1); double percentLength = (50); - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } \ No newline at end of file diff --git a/Game Files/ButtonRumble.cpp b/Game Files/ButtonRumble.cpp index 362d649..8a2b988 100644 --- a/Game Files/ButtonRumble.cpp +++ b/Game Files/ButtonRumble.cpp @@ -144,7 +144,7 @@ void ButtonRumble::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectT { double percentForce = ((RumbleStrength) / 100.0); double percentLength = (RumbleLength); - myTriggers->LeftRight(percentForce, percentForce, percentLength); + myTriggers->Rumble(percentForce, percentForce, percentLength); } } } @@ -155,7 +155,7 @@ void ButtonRumble::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectT { double percentForce = ((RumbleStrength) / 100.0); double percentLength = (RumbleLength); - myTriggers->LeftRight(0, percentForce, percentLength); + myTriggers->Rumble(0, percentForce, percentLength); } } } @@ -166,7 +166,7 @@ void ButtonRumble::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectT { double percentForce = ((RumbleStrength) / 100.0); double percentLength = (RumbleLength); - myTriggers->LeftRight(percentForce, 0, percentLength); + myTriggers->Rumble(percentForce, 0, percentLength); } } } @@ -180,7 +180,7 @@ void ButtonRumble::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectT { double percentForce = ((RumbleStrength) / 100.0); double percentLength = (RumbleLength); - myTriggers->LeftRightDevice2(percentForce, percentForce, percentLength); + myTriggers->RumbleDevice2(percentForce, percentForce, percentLength); } } } @@ -191,7 +191,7 @@ void ButtonRumble::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectT { double percentForce = ((RumbleStrength) / 100.0); double percentLength = (RumbleLength); - myTriggers->LeftRightDevice2(0, percentForce, percentLength); + myTriggers->RumbleDevice2(0, percentForce, percentLength); } } } @@ -202,7 +202,7 @@ void ButtonRumble::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectT { double percentForce = ((RumbleStrength) / 100.0); double percentLength = (RumbleLength); - myTriggers->LeftRightDevice2(percentForce, 0, percentLength); + myTriggers->RumbleDevice2(percentForce, 0, percentLength); } } } @@ -217,7 +217,7 @@ void ButtonRumble::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectT { double percentForce = ((RumbleStrength) / 100.0); double percentLength = (RumbleLength); - myTriggers->LeftRight(0, 0, percentLength); + myTriggers->Rumble(0, 0, percentLength); } } } @@ -228,7 +228,7 @@ void ButtonRumble::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectT { double percentForce = ((RumbleStrength) / 100.0); double percentLength = (RumbleLength); - myTriggers->LeftRightDevice2(0, 0, percentLength); + myTriggers->RumbleDevice2(0, 0, percentLength); } } } diff --git a/Game Files/ChaseHQ2.cpp b/Game Files/ChaseHQ2.cpp index 67e14a1..5d4bf58 100644 --- a/Game Files/ChaseHQ2.cpp +++ b/Game Files/ChaseHQ2.cpp @@ -112,7 +112,7 @@ void ChaseHQ2::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTrigg double percentForce = (31 - ff) / 15.0; double percentLength = 100; // direction from left => makes wheel turn right - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); // old logic: 31 - ff lastWasStop = 0; } @@ -123,7 +123,7 @@ void ChaseHQ2::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTrigg double percentForce = (16 - ff) / 15.0; double percentLength = 100; // direction from right => makes wheel turn left - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); // old logic: 15 - ff lastWasStop = 0; } diff --git a/Game Files/Daytona3.cpp b/Game Files/Daytona3.cpp index e82f094..cdf157f 100644 --- a/Game Files/Daytona3.cpp +++ b/Game Files/Daytona3.cpp @@ -125,14 +125,14 @@ static int RunningThread(void *ptr) { double percentForce = (31 - ff) / 15.0; double percentLength = 100; - myTriggers->LeftRight(percentForce, 0, percentLength); + myTriggers->Rumble(percentForce, 0, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_LEFT, percentForce); } else if (ff > 0) { double percentForce = (16 - ff) / 15.0; double percentLength = 100; - myTriggers->LeftRight(0, percentForce, percentLength); + myTriggers->Rumble(0, percentForce, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_RIGHT, percentForce); } } diff --git a/Game Files/Demul.cpp b/Game Files/Demul.cpp index 66d778a..6a7a18a 100644 --- a/Game Files/Demul.cpp +++ b/Game Files/Demul.cpp @@ -135,7 +135,7 @@ void Demul::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTrigge helpers->log("moving wheel left"); double percentForce = (ffnascar - 16) / 16.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((ffnascar > 0) & (ffnascar < 17)) @@ -143,7 +143,7 @@ void Demul::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTrigge helpers->log("moving wheel right"); double percentForce = (17 - ffnascar) / 16.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } @@ -154,7 +154,7 @@ void Demul::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTrigge helpers->log("moving wheel left"); double percentForce = (ffnascar - 16) / 16.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } else if ((ffnascar > 0) & (ffnascar < 17)) @@ -162,7 +162,7 @@ void Demul::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTrigge helpers->log("moving wheel right"); double percentForce = (17 - ffnascar) / 16.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } } diff --git a/Game Files/FordRacing.cpp b/Game Files/FordRacing.cpp index bb6e334..4c08fb2 100644 --- a/Game Files/FordRacing.cpp +++ b/Game Files/FordRacing.cpp @@ -30,7 +30,7 @@ void FordRacing::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTri double percentForce = (-65505 - ff) / 9.0; double percentLength = 50; // direction from left => makes wheel turn right - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); lastWasStop = 0; } @@ -41,7 +41,7 @@ void FordRacing::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTri double percentForce = (16 - ff) / 9.0; double percentLength = 50; // direction from right => makes wheel turn left - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); lastWasStop = 0; } diff --git a/Game Files/FordRacingOther.cpp b/Game Files/FordRacingOther.cpp index d6ea8c6..69bd229 100644 --- a/Game Files/FordRacingOther.cpp +++ b/Game Files/FordRacingOther.cpp @@ -27,14 +27,14 @@ static int __stdcall Out32(DWORD device, DWORD data) { double percentForce = (4294901791 - data) / 10.0; double percentLength = 100; - myTriggers->LeftRight(0, percentForce, percentLength); + myTriggers->Rumble(0, percentForce, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_RIGHT, percentForce); } else if (data > 5 && data < 16) { double percentForce = (16 - data) / 10.0; double percentLength = 100; - myTriggers->LeftRight(percentForce, 0, percentLength); + myTriggers->Rumble(percentForce, 0, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_LEFT, percentForce); } } diff --git a/Game Files/GRID.cpp b/Game Files/GRID.cpp index 305bda8..dd07d94 100644 --- a/Game Files/GRID.cpp +++ b/Game Files/GRID.cpp @@ -28,7 +28,7 @@ static int GearChangeThread(void* ptr) myHelpers->log("gear change"); double percentForce = GearChangeStrength / 100.0; myTriggers->Sine(GearChangeLength, 0, percentForce); - myTriggers->LeftRight(0, percentForce, 150); + myTriggers->Rumble(0, percentForce, 150); return 0; } @@ -70,7 +70,7 @@ void GRID::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectTriggers* { double percentForce = Wheels / 37.0; double percentLength = 100; - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); triggers->Sine(80, 80, percentForce); } @@ -78,28 +78,28 @@ void GRID::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectTriggers* { double percentForce = ((Skids - 12) / 8.0); double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); } if ((AI > 0) && (PanelBase4 > 0)) { double percentForce = (PanelBase4) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } if ((WallBase4 > 0) && (PanelBase4 > 0)) { double percentForce = (PanelBase4) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((WallBase4 < 0) && (PanelBase4 > 0)) { double percentForce = (PanelBase4) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } oldgear = newgear; diff --git a/Game Files/GTIClub3.cpp b/Game Files/GTIClub3.cpp index 343f518..11947e6 100644 --- a/Game Files/GTIClub3.cpp +++ b/Game Files/GTIClub3.cpp @@ -32,7 +32,7 @@ void GTIClub3::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri { double percentForce = (ff1) / 63.0; double percentLength = 100; - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); triggers->Sine(120, 120, percentForce); } if ((ff > 0x80) & (ff < 0x101) & (menu == 0)) @@ -40,7 +40,7 @@ void GTIClub3::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (257 - ff) / 128.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x00) & (ff < 0x80) & (menu == 0)) @@ -48,7 +48,7 @@ void GTIClub3::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (ff) / 127.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -58,7 +58,7 @@ void GTIClub3::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri { double percentForce = (ff1) / 63.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), pow(percentForce, 0.5), percentLength); + triggers->Rumble(pow(percentForce, 0.5), pow(percentForce, 0.5), percentLength); triggers->Sine(120, 120, pow(percentForce, 0.5)); } if ((ff > 0x80) & (ff < 0x101) & (menu == 0)) @@ -66,7 +66,7 @@ void GTIClub3::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (257 - ff) / 128.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x00) & (ff < 0x80) & (menu == 0)) @@ -74,7 +74,7 @@ void GTIClub3::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (ff) / 127.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } diff --git a/Game Files/HOTD4.cpp b/Game Files/HOTD4.cpp index d8d0b58..3bd9039 100644 --- a/Game Files/HOTD4.cpp +++ b/Game Files/HOTD4.cpp @@ -85,19 +85,19 @@ static int RunningThread(void *ptr) { double percentForce = ((Health1pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRight(percentForce, percentForce, percentLength); + myTriggers->Rumble(percentForce, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 1) { double percentForce = ((Health1pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRight(0, percentForce, percentLength); + myTriggers->Rumble(0, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 2) { double percentForce = ((Health1pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRight(percentForce, 0, percentLength); + myTriggers->Rumble(percentForce, 0, percentLength); } HealthA = true; } @@ -111,19 +111,19 @@ static int RunningThread(void *ptr) { double percentForce = ((Health2pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRightDevice2(percentForce, percentForce, percentLength); + myTriggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 1) { double percentForce = ((Health2pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRightDevice2(0, percentForce, percentLength); + myTriggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 2) { double percentForce = ((Health2pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRightDevice2(percentForce, 0, percentLength); + myTriggers->RumbleDevice2(percentForce, 0, percentLength); } HealthB = true; } @@ -137,19 +137,19 @@ static int RunningThread(void *ptr) { double percentForce = ((Health1pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRight(percentForce, percentForce, percentLength); + myTriggers->Rumble(percentForce, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 1) { double percentForce = ((Health1pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRight(0, percentForce, percentLength); + myTriggers->Rumble(0, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 2) { double percentForce = ((Health1pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRight(percentForce, 0, percentLength); + myTriggers->Rumble(percentForce, 0, percentLength); } } if (oldBullet1p != newBullet1p) @@ -158,19 +158,19 @@ static int RunningThread(void *ptr) { double percentForce = ((Bullet1pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRight(percentForce, percentForce, percentLength); + myTriggers->Rumble(percentForce, percentForce, percentLength); } else if (HowtoRumbleBulletEffect == 1) { double percentForce = ((Bullet1pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRight(0, percentForce, percentLength); + myTriggers->Rumble(0, percentForce, percentLength); } else if (HowtoRumbleBulletEffect == 2) { double percentForce = ((Bullet1pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRight(percentForce, 0, percentLength); + myTriggers->Rumble(percentForce, 0, percentLength); } } if (GrenadeExplode1p == 0x42) @@ -179,19 +179,19 @@ static int RunningThread(void *ptr) { double percentForce = ((Grenade1pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRight(percentForce, percentForce, percentLength); + myTriggers->Rumble(percentForce, percentForce, percentLength); } else if (HowtoRumbleGrenadeEffect == 1) { double percentForce = ((Grenade1pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRight(0, percentForce, percentLength); + myTriggers->Rumble(0, percentForce, percentLength); } else if (HowtoRumbleGrenadeEffect == 2) { double percentForce = ((Grenade1pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRight(percentForce, 0, percentLength); + myTriggers->Rumble(percentForce, 0, percentLength); } } HealthA = false; @@ -205,19 +205,19 @@ static int RunningThread(void *ptr) { double percentForce = ((Health2pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRightDevice2(percentForce, percentForce, percentLength); + myTriggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 1) { double percentForce = ((Health2pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRightDevice2(0, percentForce, percentLength); + myTriggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 2) { double percentForce = ((Health2pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRightDevice2(percentForce, 0, percentLength); + myTriggers->RumbleDevice2(percentForce, 0, percentLength); } } if (oldBullet2p != newBullet2p) @@ -226,19 +226,19 @@ static int RunningThread(void *ptr) { double percentForce = ((Bullet2pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRightDevice2(percentForce, percentForce, percentLength); + myTriggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleBulletEffect == 1) { double percentForce = ((Bullet2pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRightDevice2(0, percentForce, percentLength); + myTriggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleBulletEffect == 2) { double percentForce = ((Bullet2pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRightDevice2(percentForce, 0, percentLength); + myTriggers->RumbleDevice2(percentForce, 0, percentLength); } } if (GrenadeExplode2p == 0x42) @@ -247,19 +247,19 @@ static int RunningThread(void *ptr) { double percentForce = ((Grenade2pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRightDevice2(percentForce, percentForce, percentLength); + myTriggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleGrenadeEffect == 1) { double percentForce = ((Grenade2pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRightDevice2(0, percentForce, percentLength); + myTriggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleGrenadeEffect == 2) { double percentForce = ((Grenade2pStrength) / 100.0); double percentLength = configFeedbackLength; - myTriggers->LeftRightDevice2(percentForce, 0, percentLength); + myTriggers->RumbleDevice2(percentForce, 0, percentLength); } } HealthB = false; diff --git a/Game Files/InitialD4.cpp b/Game Files/InitialD4.cpp index d76a62f..9dc8f69 100644 --- a/Game Files/InitialD4.cpp +++ b/Game Files/InitialD4.cpp @@ -39,7 +39,7 @@ void InitialD4::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr triggers->Inertia(percentForce); triggers->Friction(percentForce); triggers->Damper(percentForce); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } } if (FFBMode == 1) @@ -52,7 +52,7 @@ void InitialD4::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr double percentForce = (128 - ff) / 72.0; double percentLength = 100; double powforce = (ff - 55) / 72.0; - triggers->LeftRight(pow(percentForce, powforce), 0, percentLength); + triggers->Rumble(pow(percentForce, powforce), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, powforce))); } else if ((ff > 0x00) && (ff < 0x49) && (ff1 == 1)) @@ -61,7 +61,7 @@ void InitialD4::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr double percentForce = (ff) / 72.0; double percentLength = 100; double powforce = (73 - ff) / 72.0; - triggers->LeftRight(0, pow(percentForce, powforce), percentLength); + triggers->Rumble(0, pow(percentForce, powforce), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, powforce))); } } @@ -75,7 +75,7 @@ void InitialD4::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr helpers->log("moving wheel right"); double percentForce = (128 - ff) / 72.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((ff > 0x00) && (ff < 0x49) && (ff1 == 1)) @@ -83,7 +83,7 @@ void InitialD4::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr helpers->log("moving wheel left"); double percentForce = (ff) / 72.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } diff --git a/Game Files/InitialD4Japan.cpp b/Game Files/InitialD4Japan.cpp index 884e73d..08ddffe 100644 --- a/Game Files/InitialD4Japan.cpp +++ b/Game Files/InitialD4Japan.cpp @@ -38,7 +38,7 @@ void InitialD4Japan::FFBLoop(EffectConstants * constants, Helpers * helpers, Eff triggers->Inertia(percentForce); triggers->Friction(percentForce); triggers->Damper(percentForce); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } } if (FFBMode == 1) @@ -51,7 +51,7 @@ void InitialD4Japan::FFBLoop(EffectConstants * constants, Helpers * helpers, Eff double percentForce = (128 - ff) / 72.0; double percentLength = 100; double powforce = (ff - 55) / 72.0; - triggers->LeftRight(pow(percentForce, powforce), 0, percentLength); + triggers->Rumble(pow(percentForce, powforce), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, powforce))); } else if ((ff > 0x00) && (ff < 0x49) && (ff1 == 1)) @@ -60,7 +60,7 @@ void InitialD4Japan::FFBLoop(EffectConstants * constants, Helpers * helpers, Eff double percentForce = (ff) / 72.0; double percentLength = 100; double powforce = (73 - ff) / 72.0; - triggers->LeftRight(0, pow(percentForce, powforce), percentLength); + triggers->Rumble(0, pow(percentForce, powforce), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, powforce))); } } @@ -74,7 +74,7 @@ void InitialD4Japan::FFBLoop(EffectConstants * constants, Helpers * helpers, Eff helpers->log("moving wheel right"); double percentForce = (128 - ff) / 72.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((ff > 0x00) && (ff < 0x49) && (ff1 == 1)) @@ -82,7 +82,7 @@ void InitialD4Japan::FFBLoop(EffectConstants * constants, Helpers * helpers, Eff helpers->log("moving wheel left"); double percentForce = (ff) / 72.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } diff --git a/Game Files/InitialD5.cpp b/Game Files/InitialD5.cpp index ce53f8a..4c057de 100644 --- a/Game Files/InitialD5.cpp +++ b/Game Files/InitialD5.cpp @@ -39,7 +39,7 @@ void InitialD5::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr triggers->Inertia(percentForce); triggers->Friction(percentForce); triggers->Damper(percentForce); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } } if (FFBMode == 1) @@ -52,7 +52,7 @@ void InitialD5::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr double percentForce = (128 - ff) / 72.0; double percentLength = 100; double powforce = (ff - 55) / 72.0; - triggers->LeftRight(pow(percentForce, powforce), 0, percentLength); + triggers->Rumble(pow(percentForce, powforce), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, powforce))); } else if ((ff > 0x00) && (ff < 0x49) && (ff1 == 1)) @@ -61,7 +61,7 @@ void InitialD5::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr double percentForce = (ff) / 72.0; double percentLength = 100; double powforce = (73 - ff) / 72.0; - triggers->LeftRight(0, pow(percentForce, powforce), percentLength); + triggers->Rumble(0, pow(percentForce, powforce), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, powforce))); } } @@ -75,7 +75,7 @@ void InitialD5::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr helpers->log("moving wheel right"); double percentForce = (128 - ff) / 72.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((ff > 0x00) && (ff < 0x49) && (ff1 == 1)) @@ -83,7 +83,7 @@ void InitialD5::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr helpers->log("moving wheel left"); double percentForce = (ff) / 72.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } diff --git a/Game Files/InitialD6.cpp b/Game Files/InitialD6.cpp index e8266b5..f7091c3 100644 --- a/Game Files/InitialD6.cpp +++ b/Game Files/InitialD6.cpp @@ -147,7 +147,7 @@ void InitialD6::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr triggers->Inertia(percentForce); triggers->Friction(percentForce); triggers->Damper(percentForce); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } if (ffcarcollision > 0) //cars colliding or rubbing with each other { @@ -156,7 +156,7 @@ void InitialD6::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr triggers->Inertia(percentForce); triggers->Friction(percentForce); triggers->Damper(percentForce); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } if (FFBMode == 1) { @@ -165,7 +165,7 @@ void InitialD6::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr double percentForce = (262272 - ff) / 72.0; double percentLength = 100; double powforce = (ff - 262199) / 72.0; - triggers->LeftRight(pow(percentForce, powforce), 0, percentLength); + triggers->Rumble(pow(percentForce, powforce), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, powforce))); } else if ((ff > 0x40100) & (ff < 0x40149)) @@ -173,7 +173,7 @@ void InitialD6::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr double percentForce = (ff - 262400) / 72.0; double percentLength = 100; double powforce = (262473 - ff) / 72.0; - triggers->LeftRight(0, pow(percentForce, powforce), percentLength); + triggers->Rumble(0, pow(percentForce, powforce), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, powforce))); } } @@ -183,14 +183,14 @@ void InitialD6::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr { double percentForce = (262272 - ff) / 72.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((ff > 0x40100) & (ff < 0x40149)) { double percentForce = (ff - 262400) / 72.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } diff --git a/Game Files/InitialD7.cpp b/Game Files/InitialD7.cpp index 9745107..a5db945 100644 --- a/Game Files/InitialD7.cpp +++ b/Game Files/InitialD7.cpp @@ -147,7 +147,7 @@ void InitialD7::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr triggers->Inertia(percentForce); triggers->Friction(percentForce); triggers->Damper(percentForce); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } if (ffcarcollision > 0) //cars colliding or rubbing with each other { @@ -156,7 +156,7 @@ void InitialD7::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr triggers->Inertia(percentForce); triggers->Friction(percentForce); triggers->Damper(percentForce); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } if (FFBMode == 1) { @@ -165,7 +165,7 @@ void InitialD7::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr double percentForce = (262272 - ff) / 72.0; double percentLength = 100; double powforce = (ff - 262199) / 72.0; - triggers->LeftRight(pow(percentForce, powforce), 0, percentLength); + triggers->Rumble(pow(percentForce, powforce), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, powforce))); } else if ((ff > 0x40100) & (ff < 0x40149)) @@ -173,7 +173,7 @@ void InitialD7::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr double percentForce = (ff - 262400) / 72.0; double percentLength = 100; double powforce = (262473 - ff) / 72.0; - triggers->LeftRight(0, pow(percentForce, powforce), percentLength); + triggers->Rumble(0, pow(percentForce, powforce), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, powforce))); } } @@ -183,14 +183,14 @@ void InitialD7::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr { double percentForce = (262272 - ff) / 72.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((ff > 0x40100) & (ff < 0x40149)) { double percentForce = (ff - 262400) / 72.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } diff --git a/Game Files/InitialD8.cpp b/Game Files/InitialD8.cpp index 309b417..40f4c51 100644 --- a/Game Files/InitialD8.cpp +++ b/Game Files/InitialD8.cpp @@ -147,7 +147,7 @@ void InitialD8::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr triggers->Inertia(percentForce); triggers->Friction(percentForce); triggers->Damper(percentForce); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } if (ffcarcollision > 0) //cars colliding or rubbing with each other { @@ -156,7 +156,7 @@ void InitialD8::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr triggers->Inertia(percentForce); triggers->Friction(percentForce); triggers->Damper(percentForce); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } if (FFBMode == 1) { @@ -165,7 +165,7 @@ void InitialD8::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr double percentForce = (262272 - ff) / 72.0; double percentLength = 100; double powforce = (ff - 262199) / 72.0; - triggers->LeftRight(pow(percentForce, powforce), 0, percentLength); + triggers->Rumble(pow(percentForce, powforce), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, powforce))); } else if ((ff > 0x40100) & (ff < 0x40149)) @@ -173,7 +173,7 @@ void InitialD8::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr double percentForce = (ff - 262400) / 72.0; double percentLength = 100; double powforce = (262473 - ff) / 72.0; - triggers->LeftRight(0, pow(percentForce, powforce), percentLength); + triggers->Rumble(0, pow(percentForce, powforce), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, powforce))); } } @@ -183,14 +183,14 @@ void InitialD8::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTr { double percentForce = (262272 - ff) / 72.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((ff > 0x40100) & (ff < 0x40149)) { double percentForce = (ff - 262400) / 72.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } diff --git a/Game Files/KODrive.cpp b/Game Files/KODrive.cpp index 0f4ad08..90abe0b 100644 --- a/Game Files/KODrive.cpp +++ b/Game Files/KODrive.cpp @@ -28,7 +28,7 @@ void KODrive::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTrig double percentForce = 0.4; double percentForce1 = 2.7; double percentLength = 100; - triggers->LeftRight(percentForce1, percentForce1, percentLength); + triggers->Rumble(percentForce1, percentForce1, percentLength); triggers->Sine(80, 80, percentForce); } if (FFBMode == 1) @@ -38,7 +38,7 @@ void KODrive::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTrig helpers->log("moving wheel right"); double percentForce = (128 - ff) / 24.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } else if ((ff > 0x00) & (ff < 0x19) & (ff1 == 1)) @@ -46,7 +46,7 @@ void KODrive::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTrig helpers->log("moving wheel left"); double percentForce = (ff) / 24.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } } @@ -57,7 +57,7 @@ void KODrive::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTrig helpers->log("moving wheel right"); double percentForce = (128 - ff) / 24.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((ff > 0x00) & (ff < 0x19) & (ff1 == 1)) @@ -65,7 +65,7 @@ void KODrive::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTrig helpers->log("moving wheel left"); double percentForce = (ff) / 24.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } diff --git a/Game Files/LGI.cpp b/Game Files/LGI.cpp index 4835d34..baa8022 100644 --- a/Game Files/LGI.cpp +++ b/Game Files/LGI.cpp @@ -99,19 +99,19 @@ void LGI::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers* { double percentForce = ((Health1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 1) { double percentForce = ((Health1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 2) { double percentForce = ((Health1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); } } if ((oldFloat2 != newFloat2) && (health2p != 0x1)) @@ -120,19 +120,19 @@ void LGI::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers* { double percentForce = ((Health2pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 1) { double percentForce = ((Health2pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(0, percentForce, percentLength); + triggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 2) { double percentForce = ((Health2pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, 0, percentLength); + triggers->RumbleDevice2(percentForce, 0, percentLength); } } if (ff1 == 0x20) @@ -141,19 +141,19 @@ void LGI::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers* { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 1) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 2) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); } } if (ff1 == 0x40) @@ -162,19 +162,19 @@ void LGI::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers* { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 1) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 2) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); } } if (ff1 == 0x4) @@ -183,19 +183,19 @@ void LGI::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers* { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 1) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(0, percentForce, percentLength); + triggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 2) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, 0, percentLength); + triggers->RumbleDevice2(percentForce, 0, percentLength); } } if (ff1 == 0x8) @@ -204,19 +204,19 @@ void LGI::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers* { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 1) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(0, percentForce, percentLength); + triggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 2) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, 0, percentLength); + triggers->RumbleDevice2(percentForce, 0, percentLength); } } if (ff1 == 0x24) @@ -225,22 +225,22 @@ void LGI::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers* { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); - triggers->LeftRightDevice2(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 1) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); - triggers->LeftRightDevice2(0, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 2) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); - triggers->LeftRightDevice2(percentForce, 0, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(percentForce, 0, percentLength); } } if (ff1 == 0x48) @@ -249,22 +249,22 @@ void LGI::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers* { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); - triggers->LeftRightDevice2(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 1) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(0, percentForce, percentLength); - triggers->LeftRightDevice2(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); + triggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 2) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, 0, percentLength); - triggers->LeftRightDevice2(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); + triggers->RumbleDevice2(percentForce, 0, percentLength); } } oldFloat1 = newFloat1; diff --git a/Game Files/LGI3D.cpp b/Game Files/LGI3D.cpp index 7e75b1f..b8e81be 100644 --- a/Game Files/LGI3D.cpp +++ b/Game Files/LGI3D.cpp @@ -100,19 +100,19 @@ void LGI3D::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers { double percentForce = ((Health1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 1) { double percentForce = ((Health1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 2) { double percentForce = ((Health1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); } } if ((oldFloat2 != newFloat2) && (health2p != 0x1)) @@ -121,19 +121,19 @@ void LGI3D::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers { double percentForce = ((Health2pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 1) { double percentForce = ((Health2pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(0, percentForce, percentLength); + triggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleHealthEffect == 2) { double percentForce = ((Health2pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, 0, percentLength); + triggers->RumbleDevice2(percentForce, 0, percentLength); } } if (ff1 == 0x20) @@ -142,19 +142,19 @@ void LGI3D::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 1) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 2) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); } } if (ff1 == 0x40) @@ -163,19 +163,19 @@ void LGI3D::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 1) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 2) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); } } if (ff1 == 0x22) @@ -184,19 +184,19 @@ void LGI3D::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 1) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 2) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); } } if (ff1 == 0x42) @@ -205,19 +205,19 @@ void LGI3D::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 1) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 2) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); } } if (ff1 == 0x4) @@ -226,19 +226,19 @@ void LGI3D::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 1) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(0, percentForce, percentLength); + triggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 2) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, 0, percentLength); + triggers->RumbleDevice2(percentForce, 0, percentLength); } } if (ff1 == 0x8) @@ -247,19 +247,19 @@ void LGI3D::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 1) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(0, percentForce, percentLength); + triggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 2) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, 0, percentLength); + triggers->RumbleDevice2(percentForce, 0, percentLength); } } if (ff1 == 0x6) @@ -268,19 +268,19 @@ void LGI3D::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 1) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(0, percentForce, percentLength); + triggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 2) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, 0, percentLength); + triggers->RumbleDevice2(percentForce, 0, percentLength); } } if (ff1 == 0xA) @@ -289,19 +289,19 @@ void LGI3D::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 1) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(0, percentForce, percentLength); + triggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 2) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRightDevice2(percentForce, 0, percentLength); + triggers->RumbleDevice2(percentForce, 0, percentLength); } } if (ff1 == 0x24) @@ -310,22 +310,22 @@ void LGI3D::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); - triggers->LeftRightDevice2(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 1) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); - triggers->LeftRightDevice2(0, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleKnockEffect == 2) { double percentForce = ((Knock1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); - triggers->LeftRightDevice2(percentForce, 0, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(percentForce, 0, percentLength); } } if (ff1 == 0x4A) @@ -334,22 +334,22 @@ void LGI3D::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, percentForce, percentLength); - triggers->LeftRightDevice2(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); + triggers->RumbleDevice2(percentForce, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 1) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(0, percentForce, percentLength); - triggers->LeftRightDevice2(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); + triggers->RumbleDevice2(0, percentForce, percentLength); } else if (HowtoRumbleMotorEffect == 2) { double percentForce = ((Motor1pStrength) / 100.0); double percentLength = configFeedbackLength; - triggers->LeftRight(percentForce, 0, percentLength); - triggers->LeftRightDevice2(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); + triggers->RumbleDevice2(percentForce, 0, percentLength); } } oldFloat1 = newFloat1; diff --git a/Game Files/M2Emulator.cpp b/Game Files/M2Emulator.cpp index 0019cd5..0fa7172 100644 --- a/Game Files/M2Emulator.cpp +++ b/Game Files/M2Emulator.cpp @@ -105,7 +105,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT helpers->log("moving wheel left"); double percentForce = (ff - 191) / 31.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x7F) & (ff < 0x9F)) @@ -113,7 +113,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT helpers->log("moving wheel right"); double percentForce = (ff - 127) / 31.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -124,7 +124,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT helpers->log("moving wheel left"); double percentForce = (ff - 191) / 31.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x7F) & (ff < 0x9F)) @@ -132,7 +132,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT helpers->log("moving wheel right"); double percentForce = (ff - 127) / 31.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -757,7 +757,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -765,7 +765,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -804,7 +804,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -812,7 +812,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -865,7 +865,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -873,7 +873,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -919,7 +919,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -927,7 +927,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -980,7 +980,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -988,7 +988,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1034,7 +1034,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -1042,7 +1042,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -1095,7 +1095,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -1103,7 +1103,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1149,7 +1149,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -1157,7 +1157,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -1210,7 +1210,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -1218,7 +1218,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1264,7 +1264,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -1272,7 +1272,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -1326,7 +1326,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -1334,7 +1334,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1373,7 +1373,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -1381,7 +1381,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2004,7 +2004,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -2012,7 +2012,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2051,7 +2051,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -2059,7 +2059,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2682,7 +2682,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -2690,7 +2690,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2729,7 +2729,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -2737,7 +2737,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -3360,7 +3360,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -3368,7 +3368,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -3407,7 +3407,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -3415,7 +3415,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -4038,7 +4038,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -4046,7 +4046,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -4085,7 +4085,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -4093,7 +4093,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -4716,7 +4716,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -4724,7 +4724,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -4763,7 +4763,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -4771,7 +4771,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -5394,7 +5394,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -5402,7 +5402,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -5441,7 +5441,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -5449,7 +5449,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -5467,7 +5467,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT helpers->log("moving wheel left"); double percentForce = (ff - 191) / 31.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x7F) & (ff < 0x9F)) @@ -5475,7 +5475,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT helpers->log("moving wheel right"); double percentForce = (ff - 127) / 31.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -5486,7 +5486,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT helpers->log("moving wheel left"); double percentForce = (ff - 191) / 31.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x7F) & (ff < 0x9F)) @@ -5494,7 +5494,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT helpers->log("moving wheel right"); double percentForce = (ff - 127) / 31.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -5512,7 +5512,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT helpers->log("moving wheel left"); double percentForce = (ff - 191) / 31.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x7F) & (ff < 0x9F)) @@ -5520,7 +5520,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT helpers->log("moving wheel right"); double percentForce = (ff - 127) / 31.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -5531,7 +5531,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT helpers->log("moving wheel left"); double percentForce = (ff - 191) / 31.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x7F) & (ff < 0x9F)) @@ -5539,7 +5539,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT helpers->log("moving wheel right"); double percentForce = (ff - 127) / 31.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -5592,7 +5592,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -5600,7 +5600,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -5646,7 +5646,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -5654,7 +5654,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -5707,7 +5707,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -5715,7 +5715,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -5761,7 +5761,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -5769,7 +5769,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -5822,7 +5822,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -5830,7 +5830,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -5876,7 +5876,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -5884,7 +5884,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -5937,7 +5937,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -5945,7 +5945,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -5991,7 +5991,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -5999,7 +5999,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -6052,7 +6052,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -6060,7 +6060,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -6106,7 +6106,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Left double percentForce = (ff - 79) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x5F) & (ff < 0x68)) @@ -6114,7 +6114,7 @@ void M2Emulator::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectT //Roll Right double percentForce = (ff - 95) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } diff --git a/Game Files/Machstorm.cpp b/Game Files/Machstorm.cpp index 9e7b2a8..ab0da56 100644 --- a/Game Files/Machstorm.cpp +++ b/Game Files/Machstorm.cpp @@ -49,61 +49,61 @@ void Machstorm::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTrig { double percentLength = (Power1RumbleLength); double percentForce = ((Power1RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 61543) { double percentLength = (Power2RumbleLength); double percentForce = ((Power2RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 61544) { double percentLength = (Power3RumbleLength); double percentForce = ((Power3RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 61545) { double percentLength = (Power4RumbleLength); double percentForce = ((Power4RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 61546) { double percentLength = (Power5RumbleLength); double percentForce = ((Power5RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 61547) { double percentLength = (Power6RumbleLength); double percentForce = ((Power6RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 61548) { double percentLength = (Power7RumbleLength); double percentForce = ((Power7RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 61549) { double percentLength = (Power8RumbleLength); double percentForce = ((Power8RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 61550) { double percentLength = (Power9RumbleLength); double percentForce = ((Power9RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 61551) { double percentLength = (Power10RumbleLength); double percentForce = ((Power10RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } } if (vibration == 1) @@ -112,61 +112,61 @@ void Machstorm::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTrig { double percentLength = (Power1RumbleLength); double percentForce = ((Power1RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 16773367) { double percentLength = (Power2RumbleLength); double percentForce = ((Power2RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 16773368) { double percentLength = (Power3RumbleLength); double percentForce = ((Power3RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 16773369) { double percentLength = (Power4RumbleLength); double percentForce = ((Power4RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 16773370) { double percentLength = (Power5RumbleLength); double percentForce = ((Power5RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 16773371) { double percentLength = (Power6RumbleLength); double percentForce = ((Power6RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 16773372) { double percentLength = (Power7RumbleLength); double percentForce = ((Power7RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 16773373) { double percentLength = (Power8RumbleLength); double percentForce = ((Power8RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 16773374) { double percentLength = (Power9RumbleLength); double percentForce = ((Power9RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (power == 16773375) { double percentLength = (Power10RumbleLength); double percentForce = ((Power10RumbleStrength) / 100.0); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } } } \ No newline at end of file diff --git a/Game Files/Mame0199.cpp b/Game Files/Mame0199.cpp index 8e93937..106fd91 100644 --- a/Game Files/Mame0199.cpp +++ b/Game Files/Mame0199.cpp @@ -1700,7 +1700,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff20495 > 0x00) & (ff20495 < 0x80)) @@ -1708,7 +1708,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1719,7 +1719,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff20495 > 0x00) & (ff20495 < 0x80)) @@ -1727,7 +1727,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -1754,7 +1754,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1762,7 +1762,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1773,7 +1773,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1781,7 +1781,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -1809,7 +1809,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1817,7 +1817,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1828,7 +1828,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1836,7 +1836,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -1864,7 +1864,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1872,7 +1872,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1883,7 +1883,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1891,7 +1891,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -1916,7 +1916,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff20495 > 0x00) & (ff20495 < 0x80)) @@ -1924,7 +1924,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1935,7 +1935,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff20495 > 0x00) & (ff20495 < 0x80)) @@ -1943,7 +1943,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -1970,7 +1970,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1978,7 +1978,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1989,7 +1989,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1997,7 +1997,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2025,7 +2025,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (124 - ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((ffrave > 0) && (ffrave < 62)) @@ -2033,7 +2033,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } @@ -2044,7 +2044,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (124 - ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } else if ((ffrave > 0) && (ffrave < 62)) @@ -2052,7 +2052,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } } @@ -2081,7 +2081,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (124 - ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((ffrave > 0) && (ffrave < 62)) @@ -2089,7 +2089,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } @@ -2100,7 +2100,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (124 - ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } else if ((ffrave > 0) && (ffrave < 62)) @@ -2108,7 +2108,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } } @@ -2136,7 +2136,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (124 - ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((ffrave > 0) && (ffrave < 62)) @@ -2144,7 +2144,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } @@ -2155,7 +2155,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (124 - ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } else if ((ffrave > 0) && (ffrave < 62)) @@ -2163,7 +2163,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } } @@ -2186,7 +2186,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff20495 > 0x00) & (ff20495 < 0x80)) @@ -2194,7 +2194,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2205,7 +2205,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff20495 > 0x00) & (ff20495 < 0x80)) @@ -2213,7 +2213,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2236,7 +2236,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcal6 > 0x00) & (ffcal6 < 0x80)) @@ -2244,7 +2244,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2255,7 +2255,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcal6 > 0x00) & (ffcal6 < 0x80)) @@ -2263,7 +2263,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2286,7 +2286,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcal6 > 0x00) & (ffcal6 < 0x80)) @@ -2294,7 +2294,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2305,7 +2305,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcal6 > 0x00) & (ffcal6 < 0x80)) @@ -2313,7 +2313,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2337,7 +2337,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcal6 > 0x00) & (ffcal6 < 0x80)) @@ -2345,7 +2345,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2356,7 +2356,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcal6 > 0x00) & (ffcal6 < 0x80)) @@ -2364,7 +2364,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2391,7 +2391,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2399,7 +2399,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2410,7 +2410,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2418,7 +2418,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2446,7 +2446,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2454,7 +2454,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2465,7 +2465,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2473,7 +2473,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2501,7 +2501,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2509,7 +2509,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2520,7 +2520,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2528,7 +2528,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2556,7 +2556,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2564,7 +2564,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2575,7 +2575,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2583,7 +2583,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2611,7 +2611,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2619,7 +2619,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2630,7 +2630,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2638,7 +2638,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2666,7 +2666,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2674,7 +2674,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2685,7 +2685,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2693,7 +2693,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2721,7 +2721,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2729,7 +2729,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2740,7 +2740,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2748,7 +2748,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2776,7 +2776,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (214 - ffcrusnusa) / 109.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnusa > 0) & (ffcrusnusa < 105)) @@ -2784,7 +2784,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnusa) / 104.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2795,7 +2795,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (214 - ffcrusnusa) / 109.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnusa > 0) & (ffcrusnusa < 105)) @@ -2803,7 +2803,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnusa) / 104.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2831,7 +2831,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (214 - ffcrusnusa) / 109.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnusa > 0) & (ffcrusnusa < 105)) @@ -2839,7 +2839,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnusa) / 104.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2850,7 +2850,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (214 - ffcrusnusa) / 109.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnusa > 0) & (ffcrusnusa < 105)) @@ -2858,7 +2858,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnusa) / 104.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2886,7 +2886,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (214 - ffcrusnusa) / 109.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnusa > 0) & (ffcrusnusa < 105)) @@ -2894,7 +2894,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnusa) / 104.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2905,7 +2905,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (214 - ffcrusnusa) / 109.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnusa > 0) & (ffcrusnusa < 105)) @@ -2913,7 +2913,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnusa) / 104.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2937,7 +2937,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -2945,7 +2945,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2956,7 +2956,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -2964,7 +2964,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2988,7 +2988,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -2996,7 +2996,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -3007,7 +3007,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -3015,7 +3015,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -3039,7 +3039,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -3047,7 +3047,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -3058,7 +3058,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -3066,7 +3066,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -3090,7 +3090,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -3098,7 +3098,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -3109,7 +3109,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -3117,7 +3117,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -3141,7 +3141,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -3149,7 +3149,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -3160,7 +3160,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -3168,7 +3168,7 @@ void Mame0199::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } diff --git a/Game Files/Mame0206.cpp b/Game Files/Mame0206.cpp index c5e761a..2d48727 100644 --- a/Game Files/Mame0206.cpp +++ b/Game Files/Mame0206.cpp @@ -1698,7 +1698,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff20495 > 0x00) & (ff20495 < 0x80)) @@ -1706,7 +1706,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1717,7 +1717,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff20495 > 0x00) & (ff20495 < 0x80)) @@ -1725,7 +1725,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -1751,7 +1751,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1759,7 +1759,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1770,7 +1770,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1778,7 +1778,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -1805,7 +1805,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1813,7 +1813,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1824,7 +1824,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1832,7 +1832,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -1859,7 +1859,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1867,7 +1867,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1878,7 +1878,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1886,7 +1886,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -1909,7 +1909,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff20495 > 0x00) & (ff20495 < 0x80)) @@ -1917,7 +1917,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1928,7 +1928,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff20495 > 0x00) & (ff20495 < 0x80)) @@ -1936,7 +1936,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -1962,7 +1962,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1970,7 +1970,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -1981,7 +1981,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (233 - ffsanfranrush) / 119.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffsanfranrush > 0) & (ffsanfranrush < 113)) @@ -1989,7 +1989,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffsanfranrush) / 112.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2016,7 +2016,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (124 - ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((ffrave > 0) && (ffrave < 62)) @@ -2024,7 +2024,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } @@ -2035,7 +2035,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (124 - ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } else if ((ffrave > 0) && (ffrave < 62)) @@ -2043,7 +2043,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } } @@ -2071,7 +2071,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (124 - ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((ffrave > 0) && (ffrave < 62)) @@ -2079,7 +2079,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } @@ -2090,7 +2090,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (124 - ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } else if ((ffrave > 0) && (ffrave < 62)) @@ -2098,7 +2098,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } } @@ -2125,7 +2125,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (124 - ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((ffrave > 0) && (ffrave < 62)) @@ -2133,7 +2133,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } @@ -2144,7 +2144,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (124 - ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } else if ((ffrave > 0) && (ffrave < 62)) @@ -2152,7 +2152,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (ffrave) / 61.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } } @@ -2173,7 +2173,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff20495 > 0x00) & (ff20495 < 0x80)) @@ -2181,7 +2181,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2192,7 +2192,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff20495 > 0x00) & (ff20495 < 0x80)) @@ -2200,7 +2200,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ff20495) / 126.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2223,7 +2223,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcal6 > 0x00) & (ffcal6 < 0x80)) @@ -2231,7 +2231,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2242,7 +2242,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcal6 > 0x00) & (ffcal6 < 0x80)) @@ -2250,7 +2250,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2271,7 +2271,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcal6 > 0x00) & (ffcal6 < 0x80)) @@ -2279,7 +2279,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2290,7 +2290,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcal6 > 0x00) & (ffcal6 < 0x80)) @@ -2298,7 +2298,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2320,7 +2320,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcal6 > 0x00) & (ffcal6 < 0x80)) @@ -2328,7 +2328,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2339,7 +2339,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcal6 > 0x00) & (ffcal6 < 0x80)) @@ -2347,7 +2347,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcal6) / 126.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2372,7 +2372,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2380,7 +2380,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2391,7 +2391,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2399,7 +2399,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2425,7 +2425,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2433,7 +2433,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2444,7 +2444,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2452,7 +2452,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2478,7 +2478,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2486,7 +2486,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2497,7 +2497,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2505,7 +2505,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2531,7 +2531,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2539,7 +2539,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2550,7 +2550,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2558,7 +2558,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2584,7 +2584,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2592,7 +2592,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2603,7 +2603,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2611,7 +2611,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2637,7 +2637,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2645,7 +2645,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2656,7 +2656,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2664,7 +2664,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2690,7 +2690,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2698,7 +2698,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2709,7 +2709,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (225 - ffcrusnwld) / 114.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnwld > 0) & (ffcrusnwld < 111)) @@ -2717,7 +2717,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnwld) / 110.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2743,7 +2743,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (214 - ffcrusnusa) / 109.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnusa > 0) & (ffcrusnusa < 105)) @@ -2751,7 +2751,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnusa) / 104.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2762,7 +2762,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (214 - ffcrusnusa) / 109.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnusa > 0) & (ffcrusnusa < 105)) @@ -2770,7 +2770,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnusa) / 104.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2796,7 +2796,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (214 - ffcrusnusa) / 109.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnusa > 0) & (ffcrusnusa < 105)) @@ -2804,7 +2804,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnusa) / 104.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2815,7 +2815,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (214 - ffcrusnusa) / 109.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnusa > 0) & (ffcrusnusa < 105)) @@ -2823,7 +2823,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnusa) / 104.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2849,7 +2849,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (214 - ffcrusnusa) / 109.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffcrusnusa > 0) & (ffcrusnusa < 105)) @@ -2857,7 +2857,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnusa) / 104.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2868,7 +2868,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (214 - ffcrusnusa) / 109.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffcrusnusa > 0) & (ffcrusnusa < 105)) @@ -2876,7 +2876,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffcrusnusa) / 104.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2898,7 +2898,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -2906,7 +2906,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2917,7 +2917,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -2925,7 +2925,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2947,7 +2947,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -2955,7 +2955,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -2966,7 +2966,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -2974,7 +2974,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -2996,7 +2996,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -3004,7 +3004,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -3015,7 +3015,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -3023,7 +3023,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -3045,7 +3045,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -3053,7 +3053,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -3064,7 +3064,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -3072,7 +3072,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } @@ -3094,7 +3094,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -3102,7 +3102,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -3113,7 +3113,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel left"); double percentForce = (255 - ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ffoff6 > 0x00) & (ffoff6 < 0x7D)) @@ -3121,7 +3121,7 @@ void Mame0206::FFBLoop(EffectConstants * constants, Helpers * helpers, EffectTri helpers->log("moving wheel right"); double percentForce = (ffoff6) / 124.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } diff --git a/Game Files/MarioKartGPDX.cpp b/Game Files/MarioKartGPDX.cpp index d07e7c5..344bc49 100644 --- a/Game Files/MarioKartGPDX.cpp +++ b/Game Files/MarioKartGPDX.cpp @@ -40,7 +40,7 @@ void MarioKartGPDX100::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff double percentForce = 1.0; double percentForce1 = 3.5; double percentLength = (500); - triggers->LeftRight(percentForce1, percentForce1, percentLength); + triggers->Rumble(percentForce1, percentForce1, percentLength); triggers->Sine(200, 200, percentForce); } @@ -49,7 +49,7 @@ void MarioKartGPDX100::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff { double percentForce = (0.3); double percentLength = (100); - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Friction(percentForce); } // Small constant when hitting bumps @@ -58,7 +58,7 @@ void MarioKartGPDX100::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff double percentForce = (0.2); double percentLength = (50); double percentForce1 = 3.0; - triggers->LeftRight(percentForce1, percentForce1, percentLength); + triggers->Rumble(percentForce1, percentForce1, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } // Wheel rumbles while driving on grass @@ -67,7 +67,7 @@ void MarioKartGPDX100::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff { double percentForce = 0.2; double percentLength = (50); - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Sine(50, 50, percentForce); } //wheel hard to turn while driving through water @@ -83,7 +83,7 @@ void MarioKartGPDX100::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff double percentForce = 0.1; double percentForce1 = 0.2; double percentLength = (150); - triggers->LeftRight(percentForce1, 0, percentLength); + triggers->Rumble(percentForce1, 0, percentLength); triggers->Sine(70, 70, percentForce); } //Wheel rumbles lightly when driving over sand @@ -93,7 +93,7 @@ void MarioKartGPDX100::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff double percentForce = 0.1; double percentForce1 = 0.2; double percentLength = (50); - triggers->LeftRight(percentForce1, 0, percentLength); + triggers->Rumble(percentForce1, 0, percentLength); triggers->Sine(70, 70, percentForce); } //Wheel rumbles lightly when driving over rough part of track @@ -103,7 +103,7 @@ void MarioKartGPDX100::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff double percentForce = 0.1; double percentForce1 = 0.2; double percentLength = (250); - triggers->LeftRight(0, percentForce1, percentLength); + triggers->Rumble(0, percentForce1, percentLength); triggers->Sine(40, 50, percentForce); } //Wheel rumbles moderately when driving over wooden bridges @@ -112,7 +112,7 @@ void MarioKartGPDX100::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff { double percentForce = 0.4; double percentLength = (100); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); triggers->Sine(120, 120, percentForce); } } \ No newline at end of file diff --git a/Game Files/MarioKartGPDX1.10.cpp b/Game Files/MarioKartGPDX1.10.cpp index 3ee8755..6bd694b 100644 --- a/Game Files/MarioKartGPDX1.10.cpp +++ b/Game Files/MarioKartGPDX1.10.cpp @@ -85,14 +85,14 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff { double percentForce = ((128 - Wheel) / (ConstantEffectForSteeringStrength / 1.0)); double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } else if ((Wheel > 127) & (Wheel < 256)) { double percentForce = ((Wheel - 127) / (ConstantEffectForSteeringStrength / 1.0)); double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } } @@ -101,7 +101,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff // Large Shake when hitting walls, other karts or getting hit by items double percentForce = ((MainShakeRumbleStrength) / 100.0); double percentLength = (500); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); triggers->Sine(200, 200, percentForce); } else if ((BoostRumble == 1) & (ff18 == 1) & (ff11 == 1)) @@ -109,7 +109,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff // Shake when Boost double percentForce = ((BoostRumbleStrength) / 100.0); double percentLength = (100); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); triggers->Sine(60, 60, percentForce); } else if ((DriftRumble == 1) & (ff17 == 1) & (Wheel >= 0) & (Wheel < 128) & (ff11 == 1)) @@ -117,7 +117,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff // Drift Effect including steering left double percentForce = (((128 - Wheel) / 128.0) * (DriftRumbleControllerStrengthMultiplier / 100.0)); double percentLength = (100); - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Friction(percentForce); } else if ((DriftRumble == 1) & (ff17 == 1) & (Wheel > 127) & (Wheel < 256) & (ff11 == 1)) @@ -125,7 +125,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff // Drift Effect including steering right double percentForce = (((Wheel - 127) / 128.0) * (DriftRumbleControllerStrengthMultiplier / 100.0)); double percentLength = (100); - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Friction(percentForce); } else if ((HitGroundRumble == 1) & (oldhitground != newhitground) & (ff5 == 1) & (ff11 == 1)) @@ -133,7 +133,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff // Shake when hitting ground double percentForce = ((HitGroundRumbleStrength) / 100.0); double percentLength = (100); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); Sleep(50); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); @@ -143,7 +143,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff // Shake when picking up new weapons or using them double percentForce = ((WeaponRumbleStrength) / 100.0); double percentLength = (300); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); triggers->Sine(80, 50, percentForce); } else if ((CoinRumble == 1) & (oldcoins != newcoins) & (ff11 == 1)) @@ -151,7 +151,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff // Shake when picking up coins double percentForce = ((CoinRumbleStrength) / 100.0); double percentLength = (200); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); triggers->Sine(50, 50, percentForce); } else if ((DirtRumble == 1) & (3 == ff3) & (ff11 == 1) & (ff5 == 1) & (Speed > 0.1)) @@ -159,7 +159,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff // small friction when driving on dirt while moving double percentForce = ((DirtRumbleStrength) / 100.0); double percentLength = (100); - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Friction(percentForce); } else if ((SpeedBumpRumble == 1) & (10 == ff3) & (ff11 == 1) & (ff5 == 1) & (Speed > 0.1)) @@ -167,7 +167,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff // Small constant when hitting bumps double percentForce = ((SpeedBumpRumbleStrength) / 100.0); double percentLength = (50); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); triggers->Constant(constants->DIRECTION_FROM_RIGHT, 0); } @@ -176,7 +176,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff // Wheel rumbles while driving on grass double percentForce = ((GrassRumbleStrength) / 100.0); double percentLength = (50); - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Sine(50, 50, percentForce); } else if ((CarpetRumble == 1) & (9 == ff3) & (ff11 == 1) & (ff5 == 1) & (Speed > 0.1)) @@ -184,7 +184,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff // Wheel rumbles while driving on carpet double percentForce = ((CarpetRumbleStrength) / 100.0); double percentLength = (50); - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Sine(50, 50, percentForce); } else if ((WaterRumble == 1) & (7 == ff3) & (ff11 == 1) & (ff5 == 1) & (Speed > 0.1) & (Wheel >= 0) & (Wheel < 128)) @@ -193,7 +193,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff double percentForce = ((WaterRumbleWheelStrength) / 100.0); double percentForce1 = ((128 - Wheel / 128.0) * (WaterRumbleControllerStrengthMultiplier / 100.0)); double percentLength = (100); - triggers->LeftRight(percentForce1, 0, percentLength); + triggers->Rumble(percentForce1, 0, percentLength); triggers->Friction(percentForce); } else if ((WaterRumble == 1) & (7 == ff3) & (ff11 == 1) & (ff5 == 1) & (Speed > 0.1) & (Wheel > 127)) @@ -201,7 +201,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff double percentForce = ((WaterRumbleWheelStrength) / 100.0); double percentForce1 = ((Wheel - 127 / 128.0) * (WaterRumbleControllerStrengthMultiplier / 100.0)); double percentLength = (100); - triggers->LeftRight(0, percentForce1, percentLength); + triggers->Rumble(0, percentForce1, percentLength); triggers->Friction(percentForce); } else if ((TileRumble == 1) & (12 == ff3) & (ff11 == 1) & (ff5 == 1) & (Speed > 0.1)) @@ -209,7 +209,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff //Wheel rumbles lightly when driving over tiles double percentForce = ((TileRumbleStrength) / 100.0); double percentLength = (150); - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Friction(percentForce); } else if ((SandRumble == 1) & (14 == ff3) & (ff11 == 1) & (ff5 == 1) & (Speed > 0.1)) @@ -217,7 +217,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff //Wheel rumbles lightly when driving over sand double percentForce = ((SandRumbleStrength) / 100.0); double percentLength = (50); - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Sine(70, 70, percentForce); } else if ((RoughTrackRumble == 1) & (11 == ff3) & (ff11 == 1) & (ff5 == 1) & (Speed > 0.1)) @@ -225,7 +225,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff //Wheel rumbles lightly when driving over rough part of track double percentForce = ((RoughTrackRumbleStrength) / 100.0); double percentLength = (100); - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Sine(40, 50, percentForce); } else if ((BridgeRumble == 1) & (8 == ff3) & (ff11 == 1) & (ff5 == 1) & (Speed > 0.1)) @@ -233,7 +233,7 @@ void MarioKartGPDX110::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff //Wheel rumbles moderately when driving over wooden bridges double percentForce = ((BridgeRumbleStrength) / 100.0); double percentLength = (100); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); triggers->Sine(120, 120, percentForce); } oldcoins = newcoins; diff --git a/Game Files/OutRun2Fake.cpp b/Game Files/OutRun2Fake.cpp index e0653b8..0e2da33 100644 --- a/Game Files/OutRun2Fake.cpp +++ b/Game Files/OutRun2Fake.cpp @@ -107,14 +107,14 @@ static int RunningThread(void *ptr) { double percentForce = ((127 - ff6) / 127.0); double percentLength = 100; - myTriggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + myTriggers->Rumble(pow(percentForce, 0.5), 0, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } if ((ff6 > 0x7F) & (ff6 < 0x100)) { double percentForce = ((ff6 - 127) / 128.0); double percentLength = 100; - myTriggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + myTriggers->Rumble(0, pow(percentForce, 0.5), percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } } @@ -124,14 +124,14 @@ static int RunningThread(void *ptr) { double percentForce = ((127 - ff6) / 127.0); double percentLength = 100; - myTriggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + myTriggers->Rumble(pow(percentForce, 0.5), 0, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } if ((ff6 > 0x7F) & (ff6 < 0x100)) { double percentForce = ((ff6 - 127) / 128.0); double percentLength = 100; - myTriggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + myTriggers->Rumble(0, pow(percentForce, 0.5), percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } } @@ -141,7 +141,7 @@ static int RunningThread(void *ptr) { double percentForce = SpeedStrength / 100.0; double percentLength = 100; - myTriggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + myTriggers->Rumble(0, pow(percentForce, 0.5), percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } } @@ -151,7 +151,7 @@ static int RunningThread(void *ptr) { double percentForce = SpeedStrength / 100.0; double percentLength = 100; - myTriggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + myTriggers->Rumble(0, pow(percentForce, 0.5), percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } } @@ -164,14 +164,14 @@ static int RunningThread(void *ptr) { double percentForce = ((127 - ff6) / 127.0); double percentLength = 100; - myTriggers->LeftRight(percentForce, 0, percentLength); + myTriggers->Rumble(percentForce, 0, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_LEFT, percentForce); } if ((ff6 > 0x7F) & (ff6 < 0x100)) { double percentForce = ((ff6 - 127) / 128.0); double percentLength = 100; - myTriggers->LeftRight(0, percentForce, percentLength); + myTriggers->Rumble(0, percentForce, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_RIGHT, percentForce); } } @@ -181,14 +181,14 @@ static int RunningThread(void *ptr) { double percentForce = ((127 - ff6) / 127.0); double percentLength = 100; - myTriggers->LeftRight(percentForce, 0, percentLength); + myTriggers->Rumble(percentForce, 0, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_LEFT, percentForce); } if ((ff6 > 0x7F) & (ff6 < 0x100)) { double percentForce = ((ff6 - 127) / 128.0); double percentLength = 100; - myTriggers->LeftRight(0, percentForce, percentLength); + myTriggers->Rumble(0, percentForce, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_RIGHT, percentForce); } } @@ -198,7 +198,7 @@ static int RunningThread(void *ptr) { double percentForce = SpeedStrength / 100.0; double percentLength = 100; - myTriggers->LeftRight(0, percentForce, percentLength); + myTriggers->Rumble(0, percentForce, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_RIGHT, percentForce); } } @@ -208,7 +208,7 @@ static int RunningThread(void *ptr) { double percentForce = SpeedStrength / 100.0; double percentLength = 100; - myTriggers->LeftRight(percentForce, 0, percentLength); + myTriggers->Rumble(percentForce, 0, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_LEFT, percentForce); } } @@ -217,7 +217,7 @@ static int RunningThread(void *ptr) { double percentForce = SpeedStrength / 100.0; double percentLength = 100; - myTriggers->LeftRight(percentForce, percentForce, percentLength); + myTriggers->Rumble(percentForce, percentForce, percentLength); myTriggers->Sine(200, 200, percentForce); } else if (ff == 8) @@ -226,7 +226,7 @@ static int RunningThread(void *ptr) { double percentForce = 0.1; double percentLength = 100; - myTriggers->LeftRight(percentForce, percentForce, percentLength); + myTriggers->Rumble(percentForce, percentForce, percentLength); myTriggers->Sine(70, 70, percentForce); } } @@ -236,7 +236,7 @@ static int RunningThread(void *ptr) { double percentForce = 0.2; double percentLength = 50; - myTriggers->LeftRight(percentForce, percentForce, percentLength); + myTriggers->Rumble(percentForce, percentForce, percentLength); myTriggers->Sine(50, 50, percentForce); } } @@ -246,7 +246,7 @@ static int RunningThread(void *ptr) { double percentForce = 0.2; double percentLength = 50; - myTriggers->LeftRight(percentForce, percentForce, percentLength); + myTriggers->Rumble(percentForce, percentForce, percentLength); myTriggers->Sine(100, 50, percentForce); } } diff --git a/Game Files/OutRun2Real.cpp b/Game Files/OutRun2Real.cpp index 0554029..4330ebf 100644 --- a/Game Files/OutRun2Real.cpp +++ b/Game Files/OutRun2Real.cpp @@ -46,21 +46,21 @@ void SendForceFeedback(__int8 force) { double percentForce = SpeedStrength / 100.0; double percentLength = 100; - myTriggers->LeftRight(0, percentForce, percentLength); + myTriggers->Rumble(0, percentForce, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_RIGHT, percentForce); } if ((force == 0x00) || (force == 0x1B) || (force == 0x14)) { double percentForce = SpeedStrength / 100.0; double percentLength = 100; - myTriggers->LeftRight(percentForce, 0, percentLength); + myTriggers->Rumble(percentForce, 0, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_LEFT, percentForce); } if (force == 0x02) { double percentForce = SpeedStrength / 100.0; double percentLength = 100; - myTriggers->LeftRight(percentForce, percentForce, percentLength); + myTriggers->Rumble(percentForce, percentForce, percentLength); myTriggers->Sine(70, 80, percentForce); } } @@ -145,7 +145,7 @@ static int RunningThread(void *ptr) double percentForce = 0.1; double percentLength = 100; myTriggers->Sine(240, 320, percentForce); - myTriggers->LeftRight(percentForce, percentForce, percentLength); + myTriggers->Rumble(percentForce, percentForce, percentLength); } oldgear = newgear; } diff --git a/Game Files/PokkenTournament.cpp b/Game Files/PokkenTournament.cpp index 68bf39c..932c6d5 100644 --- a/Game Files/PokkenTournament.cpp +++ b/Game Files/PokkenTournament.cpp @@ -45,19 +45,19 @@ void PokkenTournament::FFBLoop(EffectConstants *constants, Helpers *helpers, Eff { double percentForce = ((RumbleStrength) / 100.0); double percentLength = (RumbleLength); - triggers->LeftRight(percentForce, percentForce, percentLength); + triggers->Rumble(percentForce, percentForce, percentLength); } else if (HowtoRumble == 1) { double percentForce = ((RumbleStrength) / 100.0); double percentLength = (RumbleLength); - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); } else if (HowtoRumble == 2) { double percentForce = ((RumbleStrength) / 100.0); double percentLength = (RumbleLength); - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); } } oldFloat = newFloat; diff --git a/Game Files/RoadFighters3D.cpp b/Game Files/RoadFighters3D.cpp index af81ab6..98cdfb5 100644 --- a/Game Files/RoadFighters3D.cpp +++ b/Game Files/RoadFighters3D.cpp @@ -238,7 +238,7 @@ static int RunningThread(void *ptr) { double percentForce = (ff2) / 63.0; double percentLength = 100; - myTriggers->LeftRight(percentForce, percentForce, percentLength); + myTriggers->Rumble(percentForce, percentForce, percentLength); myTriggers->Sine(120, 120, percentForce); } if ((ff1 > 0x00) & (ff1 < 0x08)) @@ -246,7 +246,7 @@ static int RunningThread(void *ptr) //helpers->log("moving wheel left"); double percentForce = (ff1) / 7.0; double percentLength = 100; - myTriggers->LeftRight(0, percentForce, percentLength); + myTriggers->Rumble(0, percentForce, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_LEFT, percentForce); } else if ((ff1 > 0x07) & (ff1 < 0x10)) @@ -254,7 +254,7 @@ static int RunningThread(void *ptr) //helpers->log("moving wheel right"); double percentForce = (16 - ff1) / 8.0; double percentLength = 100; - myTriggers->LeftRight(percentForce, 0, percentLength); + myTriggers->Rumble(percentForce, 0, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_RIGHT, percentForce); } } @@ -264,7 +264,7 @@ static int RunningThread(void *ptr) { double percentForce = (ff2) / 63.0; double percentLength = 100; - myTriggers->LeftRight(pow(percentForce, 0.5), pow(percentForce, 0.5), percentLength); + myTriggers->Rumble(pow(percentForce, 0.5), pow(percentForce, 0.5), percentLength); myTriggers->Sine(120, 120, pow(percentForce, 0.5)); } if ((ff1 > 0x00) & (ff1 < 0x08)) @@ -272,7 +272,7 @@ static int RunningThread(void *ptr) //helpers->log("moving wheel left"); double percentForce = (ff1) / 7.0; double percentLength = 100; - myTriggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + myTriggers->Rumble(pow(percentForce, 0.5), 0, percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } else if ((ff1 > 0x07) & (ff1 < 0x10)) @@ -280,7 +280,7 @@ static int RunningThread(void *ptr) //helpers->log("moving wheel right"); double percentForce = (16 - ff1) / 8.0; double percentLength = 100; - myTriggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + myTriggers->Rumble(0, pow(percentForce, 0.5), percentLength); myTriggers->Constant(myConstants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } } diff --git a/Game Files/SegaRacingClassic.cpp b/Game Files/SegaRacingClassic.cpp index 4a320d6..9ccc401 100644 --- a/Game Files/SegaRacingClassic.cpp +++ b/Game Files/SegaRacingClassic.cpp @@ -50,7 +50,7 @@ void SegaRacingClassic::FFBLoop(EffectConstants *constants, Helpers *helpers, Ef //Roll Left double percentForce = (176 - ff) / 8.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); } else if ((ff > 0x97) & (ff < 0xA0)) @@ -58,7 +58,7 @@ void SegaRacingClassic::FFBLoop(EffectConstants *constants, Helpers *helpers, Ef //Roll Right double percentForce = (160 - ff) / 8.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); } } @@ -90,7 +90,7 @@ void SegaRacingClassic::FFBLoop(EffectConstants *constants, Helpers *helpers, Ef //Roll Left double percentForce = (176 - ff) / 8.0; double percentLength = 100; - triggers->LeftRight(0, pow(percentForce, 0.5), percentLength); + triggers->Rumble(0, pow(percentForce, 0.5), percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, (pow(percentForce, 0.5))); } else if ((ff > 0x97) & (ff < 0xA0)) @@ -98,7 +98,7 @@ void SegaRacingClassic::FFBLoop(EffectConstants *constants, Helpers *helpers, Ef //Roll Right double percentForce = (160 - ff) / 8.0; double percentLength = 100; - triggers->LeftRight(pow(percentForce, 0.5), 0, percentLength); + triggers->Rumble(pow(percentForce, 0.5), 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, (pow(percentForce, 0.5))); } } diff --git a/Game Files/SegaRally3.cpp b/Game Files/SegaRally3.cpp index 7d0bb7b..5da0689 100644 --- a/Game Files/SegaRally3.cpp +++ b/Game Files/SegaRally3.cpp @@ -27,7 +27,7 @@ void SegaRally3::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTri double percentForce = (31 - ff) / 15.0; double percentLength = 100; // direction from left => makes wheel turn right - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); lastWasStop = 0; } @@ -38,7 +38,7 @@ void SegaRally3::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTri double percentForce = (16 - ff) / 15.0; double percentLength = 100; // direction from right => makes wheel turn left - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); lastWasStop = 0; } diff --git a/Game Files/SonicSegaAllStarsRacing.cpp b/Game Files/SonicSegaAllStarsRacing.cpp index 4a6a6cc..082866c 100644 --- a/Game Files/SonicSegaAllStarsRacing.cpp +++ b/Game Files/SonicSegaAllStarsRacing.cpp @@ -32,7 +32,7 @@ void SonicSegaAllStarsRacing::FFBLoop(EffectConstants *constants, Helpers *helpe helpers->log("moving wheel right"); double percentForce = (FFB) / 18.0; double percentLength = 100; - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); lastWasStop = 0; @@ -42,7 +42,7 @@ void SonicSegaAllStarsRacing::FFBLoop(EffectConstants *constants, Helpers *helpe helpers->log("moving wheel right"); double percentForce = (256 - FFB) / 18.0; double percentLength = 100; - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); lastWasStop = 0; } diff --git a/Game Files/TestGame.cpp b/Game Files/TestGame.cpp index ac4b027..52c6a71 100644 --- a/Game Files/TestGame.cpp +++ b/Game Files/TestGame.cpp @@ -51,7 +51,7 @@ void TestGame::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTrigg triggers->Spring(0); break; case -7: - triggers->LeftRight(1.0, 1.0, SDL_HAPTIC_INFINITY); + triggers->Rumble(1.0, 1.0, SDL_HAPTIC_INFINITY); break; } } \ No newline at end of file diff --git a/Game Files/WMMT5.cpp b/Game Files/WMMT5.cpp index cae2b16..86885df 100644 --- a/Game Files/WMMT5.cpp +++ b/Game Files/WMMT5.cpp @@ -132,7 +132,7 @@ static int GearChangeThread(void* ptr) myHelpers->log("gear change"); double percentForce = GearChangeStrength / 100.0; myTriggers->Sine(GearChangeLength, GearChangeLength, percentForce); - myTriggers->LeftRight(0, percentForce, 150); + myTriggers->Rumble(0, percentForce, 150); return 0; } @@ -187,14 +187,14 @@ void WMMT5::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectTriggers helpers->log("joint/stripe on the right"); percentForce = (1.0 * collisions) * JointsAndStripesStrength / 100.0; triggers->Sine(80, 80, percentForce); - triggers->LeftRight(0, percentForce, 150); + triggers->Rumble(0, percentForce, 150); } else { helpers->log("collision on the right"); percentForce = (1.0 * collisions) * CollisionsStrength / 100.0; triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); - triggers->LeftRight(0, percentForce, 150); + triggers->Rumble(0, percentForce, 150); } } else if (0 > collisions) @@ -204,14 +204,14 @@ void WMMT5::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectTriggers helpers->log("joint/stripe on the left"); percentForce = (1.0 * collisions) * JointsAndStripesStrength / 100.0; triggers->Sine(80, 80, percentForce); - triggers->LeftRight(0, -1.0 * percentForce, 150); + triggers->Rumble(0, -1.0 * percentForce, 150); } else { helpers->log("collision on the left"); percentForce = (-1.0 * collisions) * CollisionsStrength / 100.0; triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); - triggers->LeftRight(0, percentForce, 150); + triggers->Rumble(0, percentForce, 150); } } else @@ -229,7 +229,7 @@ void WMMT5::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectTriggers if (!highSpeedVibrations && ((0 == JointsAndStripesStrength && 0 == CollisionsStrength) || (0.001 > collisions && -0.001 < collisions))) { - triggers->LeftRight(0, -1.0 * percentForce, 150); + triggers->Rumble(0, -1.0 * percentForce, 150); } } else if (0 > tiresSlip) @@ -241,7 +241,7 @@ void WMMT5::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectTriggers if (!highSpeedVibrations && ((0 == JointsAndStripesStrength && 0 == CollisionsStrength) || (0.001 > collisions && -0.001 < collisions))) { - triggers->LeftRight(0, percentForce, 150); + triggers->Rumble(0, percentForce, 150); } } @@ -267,7 +267,7 @@ void WMMT5::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectTriggers { percentForce = (((100.0 - speed) / 100.0) * ((rpm * 100.0 / 8500.0) / 100.0)) * WheelSpinStrength / 100.0; triggers->Sine(120, 120, percentForce); - triggers->LeftRight(0, percentForce, 150); + triggers->Rumble(0, percentForce, 150); msg = "tires spin: gear: " + std::to_string(gear) + " | speed: " + std::to_string(speed) + " | rpm: " + std::to_string(rpm) + " | force: " + std::to_string(percentForce); @@ -284,7 +284,7 @@ void WMMT5::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectTriggers { percentForce = (((160.0 - speed) / 150.0) * ((rpm * 100.0 / 8500.0) / 100.0)) * WheelSpinStrength / 100.0; triggers->Sine(120, 120, percentForce); - triggers->LeftRight(0, percentForce, 150); + triggers->Rumble(0, percentForce, 150); msg = "tires spin: gear: " + std::to_string(gear) + " | speed: " + std::to_string(speed) + " | rpm: " + std::to_string(rpm) + " | force: " + std::to_string(percentForce); diff --git a/Game Files/WackyRaces.cpp b/Game Files/WackyRaces.cpp index fb83149..8941ee6 100644 --- a/Game Files/WackyRaces.cpp +++ b/Game Files/WackyRaces.cpp @@ -110,7 +110,7 @@ void WackyRaces::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTri double percentForce = (31 - ff) / 15.0; double percentLength = 100; // direction from left => makes wheel turn right - triggers->LeftRight(0, percentForce, percentLength); + triggers->Rumble(0, percentForce, percentLength); triggers->Constant(constants->DIRECTION_FROM_RIGHT, percentForce); // old logic: 31 - ff lastWasStop = 0; } @@ -121,7 +121,7 @@ void WackyRaces::FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTri double percentForce = (16 - ff) / 15.0; double percentLength = 100; // direction from right => makes wheel turn left - triggers->LeftRight(percentForce, 0, percentLength); + triggers->Rumble(percentForce, 0, percentLength); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); // old logic: 15 - ff lastWasStop = 0; }