Cool_Tools/FFBArcadePlugin
1
0
Fork 0
mirror of synced 2024-11-12 01:20:49 +01:00
Code Releases Activity

Revert without mess

Browse Source
This commit is contained in:
Aaron M 2019-11-02 09:48:38 +13:00
parent 81288aca08
commit b38ebcdd02
3 changed files with 1 additions and 5151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DllMain.cpp
View File

@ -1593,7 +1593,7 @@ void TriggerRumbleEffect(double lowfrequency, double highfrequency, double lengt
{ {
EnableRumble = 0; EnableRumble = 0;
} }
} }
} }
} }

22
Game Files/GRID.cpp
View File

@ -74,24 +74,12 @@ void GRID::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectTriggers*
triggers->Sine(80, 80, percentForce); triggers->Sine(80, 80, percentForce);
} }
<<<<<<< HEAD
<<<<<<< HEAD
myTriggers = triggers;
myConstants = constants;
myHelpers = helpers;
=======
>>>>>>> parent of ea7f309... Make every game plugin have Running Thread etc
SDL_Thread* thread;
thread = SDL_CreateThread(RunningThread, "RunningThread", (void*)NULL);
=======
if ((Skids > 12) && (speedo > 0)) if ((Skids > 12) && (speedo > 0))
{ {
double percentForce = ((Skids - 12) / 8.0); double percentForce = ((Skids - 12) / 8.0);
double percentLength = 100; double percentLength = 100;
triggers->Rumble(percentForce, 0, percentLength); triggers->Rumble(percentForce, 0, percentLength);
} }
>>>>>>> parent of ede0f04... Fix GRID for Rumble to use duration of New Rumble
if ((AI > 0) && (PanelBase4 > 0)) if ((AI > 0) && (PanelBase4 > 0))
{ {
@ -99,8 +87,6 @@ void GRID::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectTriggers*
double percentLength = 100; double percentLength = 100;
triggers->Rumble(percentForce, percentForce, percentLength); triggers->Rumble(percentForce, percentForce, percentLength);
} }
<<<<<<< HEAD
=======
if ((WallBase4 > 0) && (PanelBase4 > 0)) if ((WallBase4 > 0) && (PanelBase4 > 0))
{ {
@ -116,16 +102,8 @@ void GRID::FFBLoop(EffectConstants* constants, Helpers* helpers, EffectTriggers*
triggers->Rumble(0, percentForce, percentLength); triggers->Rumble(0, percentForce, percentLength);
triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce); triggers->Constant(constants->DIRECTION_FROM_LEFT, percentForce);
} }
<<<<<<< HEAD
oldgear = newgear; oldgear = newgear;
myTriggers = triggers; myTriggers = triggers;
myConstants = constants; myConstants = constants;
myHelpers = helpers; myHelpers = helpers;
>>>>>>> parent of ede0f04... Fix GRID for Rumble to use duration of New Rumble
=======
myTriggers = triggers;
myConstants = constants;
myHelpers = helpers;
>>>>>>> parent of ea7f309... Make every game plugin have Running Thread etc
} }

5128
Game Files/M2Emulator.cpp
View File

File diff suppressed because it is too large Load Diff