Compiler Warnings: Mismatch edition. Also fixed some conversion warnings.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2557 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Marcus Wanners
2009-03-05 15:16:50 +00:00
parent cb121dab66
commit 432ea89b49
11 changed files with 24 additions and 24 deletions

View File

@ -304,7 +304,7 @@ void Shutdown()
vector elements or any bad devices */
for (int i = 0; i < 4; i++)
{
if (PadMapping[i].enabled && joyinfo.size() > PadMapping[i].ID)
if (PadMapping[i].enabled && joyinfo.size() > unsigned int(PadMapping[i].ID))
if (joyinfo.at(PadMapping[i].ID).Good)
if(SDL_JoystickOpened(PadMapping[i].ID))
{
@ -610,7 +610,7 @@ bool Search_Devices(std::vector<InputCommon::CONTROLLER_INFO> &_joyinfo, int &_N
// Update the PadState[].joy handle
for (int i = 0; i < 4; i++)
{
if (PadMapping[i].enabled && joyinfo.size() > PadMapping[i].ID)
if (PadMapping[i].enabled && joyinfo.size() > unsigned int(PadMapping[i].ID))
if(joyinfo.at(PadMapping[i].ID).Good)
PadState[i].joy = SDL_JoystickOpen(PadMapping[i].ID);
}