summaryrefslogtreecommitdiff
path: root/Source/Plugins
diff options
context:
space:
mode:
authornakeee <nakeee@gmail.com>2008-12-12 12:56:11 +0000
committernakeee <nakeee@gmail.com>2008-12-12 12:56:11 +0000
commit8fa5b24472c53c5bcac1ee6d831ffc3bcd367dfd (patch)
tree15f7f387b3b3cf4f4ba2761be22f265180be7773 /Source/Plugins
parentd61cbd747f1b68e84c18240bf1296fbd346886d1 (diff)
made BOOL into s8
I tried hard not to break windows code but please check git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1513 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins')
-rw-r--r--Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp4
-rw-r--r--Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp10
-rw-r--r--Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp10
3 files changed, 12 insertions, 12 deletions
diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
index fe6731a735..a1903432a1 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
+++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
@@ -111,7 +111,7 @@ IMPLEMENT_APP_NO_MAIN(wxDLLApp)
WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
-BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle
+s8 APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle
DWORD dwReason, // reason called
LPVOID lpvReserved) // reserved
{
@@ -568,7 +568,7 @@ unsigned int PAD_GetAttachedPads()
}
-unsigned int SaveLoadState(char* _ptr, BOOL _bSave)
+unsigned int SaveLoadState(char* _ptr, s8 _bSave)
{
return(0);
}
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
index cd82b656a3..7c14210348 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
@@ -65,8 +65,8 @@ INT g_nYForce = 0;
HRESULT InitDirectInput(HWND hDlg);
VOID FreeDirectInput();
-BOOL CALLBACK EnumFFDevicesCallback(const DIDEVICEINSTANCE* pInst, VOID* pContext);
-BOOL CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext);
+s8 CALLBACK EnumFFDevicesCallback(const DIDEVICEINSTANCE* pInst, VOID* pContext);
+s8 CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext);
HRESULT SetDeviceForcesXY();
#endif
@@ -503,7 +503,7 @@ unsigned int PAD_GetAttachedPads()
// Savestates
// ŻŻŻŻŻŻŻŻŻŻ
-unsigned int SaveLoadState(char *ptr, BOOL save)
+unsigned int SaveLoadState(char *ptr, s8 save)
{
// not used
return 0;
@@ -855,7 +855,7 @@ VOID FreeDirectInput()
SAFE_RELEASE(g_pDI);
}
-BOOL CALLBACK EnumFFDevicesCallback( const DIDEVICEINSTANCE* pInst, VOID* pContext )
+s8 CALLBACK EnumFFDevicesCallback( const DIDEVICEINSTANCE* pInst, VOID* pContext )
{
LPDIRECTINPUTDEVICE8 pDevice;
HRESULT hr;
@@ -874,7 +874,7 @@ BOOL CALLBACK EnumFFDevicesCallback( const DIDEVICEINSTANCE* pInst, VOID* pConte
return DIENUM_STOP;
}
-BOOL CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext)
+s8 CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext)
{
DWORD* pdwNumForceFeedbackAxis = (DWORD*)pContext;
if ((pdidoi->dwFlags & DIDOI_FFACTUATOR) != 0)
diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp
index cb414908c3..40f946a6a2 100644
--- a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp
+++ b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp
@@ -65,8 +65,8 @@ INT g_nYForce = 0;
HRESULT InitDirectInput(HWND hDlg);
VOID FreeDirectInput();
-BOOL CALLBACK EnumFFDevicesCallback(const DIDEVICEINSTANCE* pInst, VOID* pContext);
-BOOL CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext);
+s8 CALLBACK EnumFFDevicesCallback(const DIDEVICEINSTANCE* pInst, VOID* pContext);
+s8 CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext);
HRESULT SetDeviceForcesXY();
#endif
@@ -610,7 +610,7 @@ unsigned int PAD_GetAttachedPads()
// Savestates
// ŻŻŻŻŻŻŻŻŻŻ
-unsigned int SaveLoadState(char *ptr, BOOL save)
+unsigned int SaveLoadState(char *ptr, s8 save)
{
// not used
return 0;
@@ -973,7 +973,7 @@ VOID FreeDirectInput()
SAFE_RELEASE(g_pDI);
}
-BOOL CALLBACK EnumFFDevicesCallback( const DIDEVICEINSTANCE* pInst, VOID* pContext )
+s8 CALLBACK EnumFFDevicesCallback( const DIDEVICEINSTANCE* pInst, VOID* pContext )
{
LPDIRECTINPUTDEVICE8 pDevice;
HRESULT hr;
@@ -992,7 +992,7 @@ BOOL CALLBACK EnumFFDevicesCallback( const DIDEVICEINSTANCE* pInst, VOID* pConte
return DIENUM_STOP;
}
-BOOL CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext)
+s8 CALLBACK EnumAxesCallback(const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext)
{
DWORD* pdwNumForceFeedbackAxis = (DWORD*)pContext;
if((pdidoi->dwFlags & DIDOI_FFACTUATOR) != 0)