Make InputCommon build in debug mode. Seriously, WTF? Debugging code relying on functions that simply aren't there. Nakee?????
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2331 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
5a66927610
commit
76a78dd60d
|
@ -60,11 +60,6 @@ namespace InputCommon
|
||||||
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
|
||||||
bool SearchDevices(std::vector<CONTROLLER_INFO> &_joyinfo, int &_NumPads, int &_NumGoodPads)
|
bool SearchDevices(std::vector<CONTROLLER_INFO> &_joyinfo, int &_NumPads, int &_NumGoodPads)
|
||||||
{
|
{
|
||||||
// Load config
|
|
||||||
#ifdef _DEBUG
|
|
||||||
DEBUG_INIT();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* SDL 1.3 use DirectInput instead of the old Microsoft Multimedia API, and with this we need
|
/* SDL 1.3 use DirectInput instead of the old Microsoft Multimedia API, and with this we need
|
||||||
the SDL_INIT_VIDEO flag to */
|
the SDL_INIT_VIDEO flag to */
|
||||||
if (!SDL_WasInit(0))
|
if (!SDL_WasInit(0))
|
||||||
|
@ -74,11 +69,6 @@ bool SearchDevices(std::vector<CONTROLLER_INFO> &_joyinfo, int &_NumPads, int &_
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _DEBUG
|
|
||||||
fprintf(pFile, "Scanning for devices\n");
|
|
||||||
fprintf(pFile, "¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯\n");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Get device status
|
// Get device status
|
||||||
int numjoy = SDL_NumJoysticks();
|
int numjoy = SDL_NumJoysticks();
|
||||||
for (int i = 0; i < numjoy; i++ )
|
for (int i = 0; i < numjoy; i++ )
|
||||||
|
@ -110,15 +100,6 @@ bool SearchDevices(std::vector<CONTROLLER_INFO> &_joyinfo, int &_NumPads, int &_
|
||||||
|
|
||||||
_joyinfo.push_back(Tmp);
|
_joyinfo.push_back(Tmp);
|
||||||
|
|
||||||
#ifdef _DEBUG
|
|
||||||
fprintf(pFile, "ID: %d\n", i);
|
|
||||||
fprintf(pFile, "Name: %s\n", joyinfo[i].Name);
|
|
||||||
fprintf(pFile, "Buttons: %d\n", joyinfo[i].NumButtons);
|
|
||||||
fprintf(pFile, "Axes: %d\n", joyinfo[i].NumAxes);
|
|
||||||
fprintf(pFile, "Hats: %d\n", joyinfo[i].NumHats);
|
|
||||||
fprintf(pFile, "Balls: %d\n\n", joyinfo[i].NumBalls);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// We have now read the values we need so we close the device
|
// We have now read the values we need so we close the device
|
||||||
if (SDL_JoystickOpened(i)) SDL_JoystickClose(_joyinfo[i].joy);
|
if (SDL_JoystickOpened(i)) SDL_JoystickClose(_joyinfo[i].joy);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue