1
0
mirror of synced 2024-11-24 06:50:11 +01:00

Merge pull request #12 from Boomslangnz/harddrivinJPB

Hard Drivin' et al support- removed debugging junk and fix for max forces
This commit is contained in:
jpb7875 2020-11-08 18:52:15 -06:00 committed by GitHub
commit 542ba5f5d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -277,9 +277,6 @@ extern SDL_Haptic* ControllerHaptic3;
extern SDL_Haptic* haptic3; extern SDL_Haptic* haptic3;
Helpers* hlp;
//Config Settings //Config Settings
extern wchar_t* settingsFilename; extern wchar_t* settingsFilename;
extern int DeviceGUID; extern int DeviceGUID;
@ -1550,8 +1547,6 @@ void MAMESupermodel::FFBLoop(EffectConstants* constants, Helpers* helpers, Effec
if (!init) if (!init)
{ {
hlp = helpers;
CreateThread(NULL, 0, ThreadForOutputs, NULL, 0, NULL); CreateThread(NULL, 0, ThreadForOutputs, NULL, 0, NULL);
wchar_t* deviceGUIDString2 = new wchar_t[256]; wchar_t* deviceGUIDString2 = new wchar_t[256];
@ -3731,19 +3726,22 @@ void MAMESupermodel::FFBLoop(EffectConstants* constants, Helpers* helpers, Effec
sprintf(test, "hex print: %d", HardDrivinFFB); sprintf(test, "hex print: %d", HardDrivinFFB);
OutputDebugStringA(test); OutputDebugStringA(test);
std::string ffs = std::to_string(HardDrivinFFB); //std::string ffs = std::to_string(HardDrivinFFB);
std::string val0 = std::to_string(vals[0]); //std::string val0 = std::to_string(vals[0]);
std::string val1 = std::to_string(vals[1]); //std::string val1 = std::to_string(vals[1]);
std::string val2 = std::to_string(vals[2]); //std::string val2 = std::to_string(vals[2]);
std::string val3 = std::to_string(vals[3]); //std::string val3 = std::to_string(vals[3]);
std::string val4 = std::to_string(vals[4]); //std::string val4 = std::to_string(vals[4]);
static char moreTest[256]; //static char moreTest[256];
memset(moreTest, 0, 256); //memset(moreTest, 0, 256);
sprintf(moreTest, "vals=%s %s %s %s FFS=%s", val0.c_str(), val1.c_str(), val2.c_str(), val3.c_str(), ffs.c_str()); //sprintf(moreTest, "vals=%s %s %s %s FFS=%s", val0.c_str(), val1.c_str(), val2.c_str(), val3.c_str(), ffs.c_str());
helpers->log((char*)moreTest); //helpers->log((char*)moreTest);
if (HardDrivinFFB > 100 || HardDrivinFFB < -100) { if (HardDrivinFFB > 100) {
HardDrivinFFB = 0; HardDrivinFFB = 100;
}
if (HardDrivinFFB < -100) {
HardDrivinFFB = -100;
} }
if (HardDrivinFFB >= 0) if (HardDrivinFFB >= 0)
{ {