Modify MAME to all be on one

Config/FFBPlugin.ini

@@ -293,37 +293,14 @@ EnableForceTimeUp=0
 ForceFinishButton=99
 ForceTimeUpButton=99
 
-[Mame 0199 32bit]
-GameId=34
-MinForce=0
-MaxForce=75
-DefaultCentering=0
-FeedbackLength=500
-PowerMode=0
-
-[Mame 0199 64bit]
-GameId=34
-MinForce=0
-MaxForce=75
-DefaultCentering=0
-FeedbackLength=500
-PowerMode=0
-
-[Mame 0206 32bit]
-GameId=33
-MinForce=0
-MaxForce=75
-DefaultCentering=0
-FeedbackLength=500
-PowerMode=0
-
-[Mame 0206 64bit]
+[Mame]
 GameId=33
 MinForce=0
 MaxForce=75
 DefaultCentering=0
 FeedbackLength=500
 PowerMode=0
+MameVersion=
 
 [Sonic & Sega All Stars Racing]
 GameId=21

Dinput8Wrapper.vcxproj

@@ -28,7 +28,7 @@
     <ClInclude Include="Game Files\Demul.h" />
     <ClInclude Include="dinput8.def">
     </ClInclude>
-    <ClInclude Include="Game Files\Mame0206.h" />
+    <ClInclude Include="Game Files\Mame.h" />
     <ClInclude Include="Game Files\MarioKartGPDX1.10.h" />
     <ClInclude Include="Game Files\InitialD5.h" />
     <ClInclude Include="Game Files\InitialD4Japan.h" />
@@ -63,7 +63,7 @@
     <ClCompile Include="Game Files\InitialD7.cpp" />
     <ClCompile Include="Game Files\InitialD8.cpp" />
     <ClCompile Include="Game Files\Machstorm.cpp" />
-    <ClCompile Include="Game Files\Mame0206.cpp" />
+    <ClCompile Include="Game Files\Mame.cpp" />
     <ClCompile Include="Game Files\OutRun2Fake.cpp" />
     <ClCompile Include="Game Files\PokkenTournament.cpp" />
     <ClCompile Include="Game Files\SegaRally3.cpp" />
@@ -72,7 +72,6 @@
     <ClCompile Include="Game Files\MarioKartGPDX.cpp" />
     <ClCompile Include="Game Files\SonicSegaAllStarsRacing.cpp" />
     <ClCompile Include="Game Files\TestGame.cpp" />
-    <ClCompile Include="Game Files\Mame0199.cpp" />
     <ClCompile Include="Game Files\WackyRaces.cpp" />
     <ClCompile Include="Game Files\WMMT5.cpp" />
     <ClCompile Include="Game Files\InitialD4Japan.cpp" />
@@ -105,7 +104,6 @@
     <ClInclude Include="Game Files\MarioKartGPDX.h" />
     <ClInclude Include="Game Files\SonicSegaAllStarsRacing.h" />
     <ClInclude Include="Game Files\TestGame.h" />
-    <ClInclude Include="Game Files\Mame0199.h" />
     <ClInclude Include="Game Files\WackyRaces.h" />
     <ClInclude Include="Game Files\WMMT5.h" />
     <ClInclude Include="Game Files\GTIClub3.h" />

Dinput8Wrapper.vcxproj.filters

@@ -111,12 +111,9 @@
     <ClCompile Include="Game Files\ButtonRumble.cpp">
       <Filter>Game Files</Filter>
     </ClCompile>
-    <ClCompile Include="Game Files\Mame0199.cpp">
-      <Filter>Game Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Game Files\Mame0206.cpp" />
     <ClCompile Include="Game Files\HOTD4.cpp" />
     <ClCompile Include="Game Files\GRID.cpp" />
+    <ClCompile Include="Game Files\Mame.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Game Files\Daytona3.h">
@@ -225,18 +222,15 @@
     <ClInclude Include="Game Files\ButtonRumble.h">
       <Filter>Game Files</Filter>
     </ClInclude>
-    <ClInclude Include="Game Files\Mame0199.h">
-      <Filter>Game Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Game Files\Mame0206.h">
-      <Filter>Common Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Game Files\HOTD4.h">
       <Filter>Common Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Game Files\GRID.h">
       <Filter>Common Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Game Files\Mame.h">
+      <Filter>Common Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <MASM Include="DLLWrapper.asm" />

DllMain.cpp

@@ -44,7 +44,7 @@ along with FFB Arcade Plugin.If not, see < https://www.gnu.org/licenses/>.
 #include "Game Files/OutRun2Real.h"
 #include "Game Files/SegaRacingClassic.h"
 #include "Game Files/SegaRally3.h"
-#include "Game Files/Mame0199.h"
+#include "Game Files/Mame.h"
 #include "Game Files/WackyRaces.h"
 #include "Game Files/WMMT5.h"
 #include "Game Files/BG4JP.h"
@@ -60,7 +60,6 @@ along with FFB Arcade Plugin.If not, see < https://www.gnu.org/licenses/>.
 #include "Game Files/RoadFighters3D.h"
 #include "Game Files/LGI3D.h"
 #include "Game Files/LGI.h"
-#include "Game Files/Mame0206.h"
 #include "Game Files/KODrive.h"
 #include "Game Files/HOTD4.h"
 
@@ -907,8 +906,7 @@ const int Button_Rumble = 28;
 const int Road_Fighters_3D = 29;
 const int LGI_3D = 30;
 const int LGI_ = 31;
-const int MAME_0206 = 33;
-const int MAME_0199 = 34;
+const int MAME_ = 33;
 const int OUTRUN_2Real = 35;
 const int FORD_RACING_OTHER = 38;
 const int KO_Drive = 39;
@@ -1793,11 +1791,8 @@ DWORD WINAPI FFBLoop(LPVOID lpParam)
 	case LGI_:
 		game = new LGI;
 		break;
-	case MAME_0199:
-		game = new Mame0199;
-		break;
-	case MAME_0206:
-		game = new Mame0206;
+	case MAME_:
+		game = new Mame;
 		break;
 	case KO_Drive:
 		game = new KODrive;

Game Files/Mame.h

@@ -13,7 +13,7 @@ along with FFB Arcade Plugin.If not, see < https://www.gnu.org/licenses/>.
 
 #pragma once
 #include "../Common Files/Game.h"
-class Mame0199 : public Game {
+class Mame : public Game {
 
 public:
 	void FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers* triggers);

Game Files/Mame0206.h

@@ -1,20 +0,0 @@
-/*This file is part of FFB Arcade Plugin.
-FFB Arcade Plugin is free software : you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-FFB Arcade Plugin is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
-GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with FFB Arcade Plugin.If not, see < https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-#include "../Common Files/Game.h"
-class Mame0206 : public Game {
-
-public:
-	void FFBLoop(EffectConstants *constants, Helpers *helpers, EffectTriggers* triggers);
-};