archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix building with precompiled headers

Browse source 
add the unimplemented modules to the emucore project

fix a bug in the rXml wrapper that didn't consider the possiblity of functions returning null pointers
This commit is contained in:
Peter Tissen 2014-06-08 13:43:13 +02:00
parent c37905e465
commit 314307b840
5 changed files with 209 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Utilities/rPlatform.cpp
View file

@ -11,6 +11,10 @@
#include "Emu/Io/Null/NullPadHandler.h"
#include "Emu/Io/Windows/WindowsPadHandler.h"
#if defined(_WIN32)
#include "Emu/Io/XInput/XInputPadHandler.h"
#endif
rCanvas::rCanvas(void *parent)
{
@ -118,13 +122,16 @@ int rPlatform::getKeyboardHandlerCount()
KeyboardHandlerBase *rPlatform::getKeyboardHandler(int i)
{
if (i == 0)
switch (i)
{
return new NullKeyboardHandler();
}
else if (i == 1)
{
return new WindowsKeyboardHandler();
case 0:
return new NullKeyboardHandler();
break;
case 1:
return new WindowsKeyboardHandler();
break;
default:
return new NullKeyboardHandler();
}
}
@ -136,30 +143,45 @@ int rPlatform::getMouseHandlerCount()
MouseHandlerBase *rPlatform::getMouseHandler(int i)
{
if (i == 0)
switch (i)
{
case 0:
return new NullMouseHandler();
}
else if (i == 1)
{
break;
case 1:
return new WindowsMouseHandler();
break;
default:
return new NullMouseHandler();
}
}
int rPlatform::getPadHandlerCount()
{
#if defined(_WIN32)
return 3;
#else
return 2;
#endif
}
PadHandlerBase *rPlatform::getPadHandler(int i)
{
if (i == 0)
switch (i)
{
case 0:
return new NullPadHandler();
break;
case 1:
return new WindowsPadHandler();
break;
#if defined(_WIN32)
case 2:
return new XInputPadHandler();
break;
#endif
default:
return new NullPadHandler();
}
else if (i == 1)
{
return new WindowsPadHandler();
}
}