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

Zeropad: fix minor typo in previous commit that got copied and pasted several times. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1150 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-05-07 23:49:12 +00:00
parent a0a4abdcc1
commit 0005b749b5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/zeropad/Linux/joystick.cpp
View File

@ -40,7 +40,7 @@ void JoystickInfo::EnumerateJoysticks(vector<JoystickInfo*>& vjoysticks)
vector<JoystickInfo*>::iterator it = vjoysticks.begin(); vector<JoystickInfo*>::iterator it = vjoysticks.begin();
// Delete everything in the vector vjoysticks. // Delete everything in the vector vjoysticks.
while (it < vjoysticks.end()) while (it != vjoysticks.end())
{ {
delete *it; delete *it;
it ++; it ++;

9
plugins/zeropad/Linux/linux.cpp
View File

@ -80,7 +80,7 @@ void _PADclose()
vector<JoystickInfo*>::iterator it = s_vjoysticks.begin(); vector<JoystickInfo*>::iterator it = s_vjoysticks.begin();
// Delete everything in the vector vjoysticks. // Delete everything in the vector vjoysticks.
while (it < s_vjoysticks.end()) while (it != s_vjoysticks.end())
{ {
delete *it; delete *it;
it ++; it ++;
@ -336,6 +336,7 @@ void CALLBACK PADupdate(int pad)
int value = SDL_JoystickGetAxis((pjoy)->GetJoy(), PAD_GETJOYSTICK_AXIS(key)); int value = SDL_JoystickGetAxis((pjoy)->GetJoy(), PAD_GETJOYSTICK_AXIS(key));
int pad = (pjoy)->GetPAD(); int pad = (pjoy)->GetPAD();
if (PAD_GETPOVSIGN(key) && (value < -2048)) if (PAD_GETPOVSIGN(key) && (value < -2048))
status[pad] &= ~(1 << i); status[pad] &= ~(1 << i);
else if (!PAD_GETPOVSIGN(key) && (value > 2048)) else if (!PAD_GETPOVSIGN(key) && (value > 2048))
@ -453,7 +454,7 @@ void OnConf_Key(GtkButton *button, gpointer user_data)
SDL_JoystickUpdate(); SDL_JoystickUpdate();
// Save everything in the vector s_vjoysticks. // Save everything in the vector s_vjoysticks.
while (itjoy < s_vjoysticks.end()) while (itjoy != s_vjoysticks.end())
{ {
(*itjoy)->SaveState(); (*itjoy)->SaveState();
itjoy++; itjoy++;
@ -483,7 +484,7 @@ void OnConf_Key(GtkButton *button, gpointer user_data)
SDL_JoystickUpdate(); SDL_JoystickUpdate();
while (itjoy < s_vjoysticks.end()) while (itjoy != s_vjoysticks.end())
{ {
// MAKE sure to look for changes in the state!! // MAKE sure to look for changes in the state!!
for (int i = 0; i < (*itjoy)->GetNumButtons(); ++i) for (int i = 0; i < (*itjoy)->GetNumButtons(); ++i)
@ -586,7 +587,7 @@ void CALLBACK PADconfigure()
vector<JoystickInfo*>::iterator it = s_vjoysticks.begin(); vector<JoystickInfo*>::iterator it = s_vjoysticks.begin();
// Delete everything in the vector vjoysticks. // Delete everything in the vector vjoysticks.
while (it < s_vjoysticks.end()) while (it != s_vjoysticks.end())
{ {
sprintf(str, "%d: %s - but: %d, axes: %d, pov: %d", (*it)->GetId(), (*it)->GetName().c_str(), sprintf(str, "%d: %s - but: %d, axes: %d, pov: %d", (*it)->GetId(), (*it)->GetName().c_str(),
(*it)->GetNumButtons(), (*it)->GetNumAxes(), (*it)->GetNumPOV()/*, (*it)->GetNumHats()*/); // ,hats: %d (*it)->GetNumButtons(), (*it)->GetNumAxes(), (*it)->GetNumPOV()/*, (*it)->GetNumHats()*/); // ,hats: %d