ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

onepad: Fix variable type 

Fixes a type limits warning on a 64-bit build.
This commit is contained in:
Jonathan Li 2016-12-18 14:32:13 +00:00
parent c974a0d888
commit 0708d7c539
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/onepad/SDL/joystick.cpp
View File

@ -198,7 +198,7 @@ bool JoystickInfo::Init(int id)
// are digital (select, start, l3, r3). To avoid conflict just forget the others. // are digital (select, start, l3, r3). To avoid conflict just forget the others.
// Keep the 4 hat buttons too (usb driver). (left pressure does not work with recent kernel). Moreover the pressure // Keep the 4 hat buttons too (usb driver). (left pressure does not work with recent kernel). Moreover the pressure
// work sometime on half axis neg others time in fulll axis. So better keep them as button for the moment // work sometime on half axis neg others time in fulll axis. So better keep them as button for the moment
u32 found_hack = devname.find(string("PLAYSTATION(R)3")); auto found_hack = devname.find("PLAYSTATION(R)3");
// FIXME: people need to restart the plugin to take the option into account. // FIXME: people need to restart the plugin to take the option into account.
bool hack_enabled = (conf->pad_options[0].sixaxis_pressure) || (conf->pad_options[1].sixaxis_pressure); bool hack_enabled = (conf->pad_options[0].sixaxis_pressure) || (conf->pad_options[1].sixaxis_pressure);
if (found_hack != string::npos && numaxes > 4 && hack_enabled) { if (found_hack != string::npos && numaxes > 4 && hack_enabled) {
@ -276,7 +276,7 @@ bool JoystickInfo::PollButtons(u32 &pkey)
bool JoystickInfo::PollAxes(u32 &pkey) bool JoystickInfo::PollAxes(u32 &pkey)
{ {
u32 found_hack = devname.find(string("PLAYSTATION(R)3")); auto found_hack = devname.find("PLAYSTATION(R)3");
for (int i = 0; i < GetNumAxes(); ++i) { for (int i = 0; i < GetNumAxes(); ++i) {
// Sixaxis, dualshock3 hack // Sixaxis, dualshock3 hack