piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

4
Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp
View File

@ -141,7 +141,7 @@ void Config::Save(int Slot)
{
/* Save joypad specific settings. Check for "PadMapping[i].ID < SDL_NumJoysticks()" to
avoid reading a joyinfo that does't exist */
if(PadMapping[i].ID >= joyinfo.size()) continue;
if(unsigned int(PadMapping[i].ID) >= joyinfo.size()) continue;
// Create a new section name after the joypad name
SectionName = joyinfo[PadMapping[i].ID].Name;
@ -234,7 +234,7 @@ void Config::Load(bool ChangePad, bool ChangeSaveByID)
{
/* Prevent a crash from illegal access to joyinfo that will only have values for
the current amount of connected pads */
if(PadMapping[i].ID >= joyinfo.size()) continue;
if(unsigned int(PadMapping[i].ID) >= joyinfo.size()) continue;
// Create a section name
SectionName = joyinfo[PadMapping[i].ID].Name;

2
Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigAdvanced.cpp
View File

@ -256,7 +256,7 @@ void ConfigBox::Update()
is not update when the emulator is paused. */
if (g_Config.bCheckFocus || IsFocus()) // && !g_EmulatorRunning)
{
for (int i = 0; i < joyinfo.size(); i++)
for (int i = 0; unsigned int(i) < joyinfo.size(); i++)
InputCommon::GetJoyState(PadState[i], PadMapping[i], i, joyinfo[PadMapping[i].ID].NumButtons);
}

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()));
}

4
Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
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);
}