piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 05:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow use of Logger window without entire debug suite via the -l command line option, make the options actually viewable in the logger and a very little bit of a cleanup in nJoy Test

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1633 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2008-12-23 08:49:52 +00:00
parent 62fff80925
commit 2852d1b84f
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp
View File

@ -36,7 +36,6 @@
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
FILE *pFile;
HINSTANCE nJoy_hInst = NULL;
CONTROLLER_INFO *joyinfo = 0;
CONTROLLER_STATE joystate[4];
CONTROLLER_MAPPING joysticks[4];
@ -55,7 +54,7 @@ bool g_rumbleEnable = FALSE;
// Rumble in windows
#ifdef _WIN32
HINSTANCE nJoy_hInst = NULL;
#ifdef USE_RUMBLE_DINPUT_HACK
LPDIRECTINPUT8 g_pDI = NULL;
LPDIRECTINPUTDEVICE8 g_pDevice = NULL;
@ -80,7 +79,7 @@ HRESULT SetDeviceForcesXY();
struct ff_effect effect;
bool CanRumble = false;
#endif
#ifdef _WIN32
//////////////////////////////////////////////////////////////////////////////////////////
// wxWidgets
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@ -98,7 +97,7 @@ WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
//////////////////////////////////////////////////////////////////////////////////////////
// DllMain
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#ifdef _WIN32
BOOL APIENTRY DllMain( HINSTANCE hinstDLL, // DLL module handle
DWORD dwReason, // reason called
LPVOID lpvReserved) // reserved
@ -285,7 +284,7 @@ void PAD_GetStatus(u8 _numPAD, SPADStatus* _pPADStatus)
// Adjust range
// The value returned by SDL_JoystickGetAxis is a signed integer (-32768 to 32768)
// The value used for the gamecube controller is an unsigned char (0 to 255)
int main_stick_x, main_stick_y, sub_stick_x, sub_stick_y;
int main_stick_x = 0, main_stick_y = 0, sub_stick_x = 0, sub_stick_y = 0;
if(joysticks[_numPAD].buttons[CTL_MAIN_X].c_str()[0] == 'A') // Axis
{
main_stick_x = (joystate[_numPAD].buttons[CTL_MAIN_X]>>8);
@ -678,14 +677,8 @@ int Search_Devices()
}
if(joyinfo)
{
delete [] joyinfo;
joyinfo = new CONTROLLER_INFO [numjoy];
}
else
{
joyinfo = new CONTROLLER_INFO [numjoy];
}
joyinfo = new CONTROLLER_INFO [numjoy];
#ifdef _DEBUG
fprintf(pFile, "Scanning for devices\n");