mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-22 11:02:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

8
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
View file

@ -386,7 +386,7 @@ void ConfigBox::SetButtonTextAll(int id, char text[128])
for (int i = 0; i < 4; i++)
{
// Safety check to avoid crash
if(joyinfo.size() > PadMapping[i].ID)
if(joyinfo.size() > unsigned int(PadMapping[i].ID))
if (joyinfo[PadMapping[i].ID].Name == joyinfo[PadMapping[notebookpage].ID].Name)
SetButtonText(id, text, i);
};
@ -397,7 +397,7 @@ void ConfigBox::SaveButtonMappingAll(int Slot)
for (int i = 0; i < 4; i++)
{
// This can occur when no gamepad is detected
if(joyinfo.size() > PadMapping[i].ID)
if(joyinfo.size() > unsigned int(PadMapping[i].ID))
if (joyinfo[PadMapping[i].ID].Name == joyinfo[PadMapping[Slot].ID].Name)
SaveButtonMapping(i, false, Slot);
}
@ -414,7 +414,7 @@ void ConfigBox::UpdateGUIAll(int Slot)
for (int i = 0; i < 4; i++)
{
// Safety check to avoid crash
if(joyinfo.size() > PadMapping[i].ID)
if(joyinfo.size() > unsigned int(PadMapping[i].ID))
if (joyinfo[PadMapping[i].ID].Name == joyinfo[PadMapping[Slot].ID].Name)
UpdateGUI(i);
}
@ -660,7 +660,7 @@ void ConfigBox::CreateGUIControls()
wxArrayString arrayStringFor_Joyname; // The string array
if(NumGoodPads > 0)
{
for(int x = 0; x < joyinfo.size(); x++)
for(int x = 0; unsigned int(x) < joyinfo.size(); x++)
{
arrayStringFor_Joyname.Add(wxString::FromAscii(joyinfo[x].Name.c_str()));
}