The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-14 00:09:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

nJoy: Slight oversight in last commit

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2088 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-02-03 10:25:45 +00:00
parent fcb951c0c9
commit 2b8d2134e5
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9,00"
Name="Plugin_nJoy_SDL" Name="Plugin_nJoy_SDL"
ProjectGUID="{521498BE-6089-4780-8223-E67C22F4E068}" ProjectGUID="{521498BE-6089-4780-8223-E67C22F4E068}"
RootNamespace="Plugin_nJoy_SDL" RootNamespace="Plugin_nJoy_SDL"
@ -506,6 +506,10 @@
RelativePath=".\Src\Config.cpp" RelativePath=".\Src\Config.cpp"
> >
</File> </File>
<File
RelativePath=".\Src\Config.h"
>
</File>
<File <File
RelativePath=".\Src\nJoy.cpp" RelativePath=".\Src\nJoy.cpp"
> >
@ -538,10 +542,6 @@
RelativePath=".\Src\GUI\AboutBox.h" RelativePath=".\Src\GUI\AboutBox.h"
> >
</File> </File>
<File
RelativePath=".\Src\Config.h"
>
</File>
<File <File
RelativePath=".\Src\GUI\ConfigAdvanced.cpp" RelativePath=".\Src\GUI\ConfigAdvanced.cpp"
> >

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

@ -105,6 +105,7 @@ void Config::Save(int Slot)
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
file.Set("General", "ShowAdvanced", g_Config.bShowAdvanced); file.Set("General", "ShowAdvanced", g_Config.bShowAdvanced);
file.Set("General", "SaveByID", g_Config.bSaveByID); file.Set("General", "SaveByID", g_Config.bSaveByID);
file.Set("General", "CheckForFocus", g_Config.bCheckFocus);
// ======================== // ========================
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
@ -163,8 +164,7 @@ void Config::Save(int Slot)
file.Set(SectionName.c_str(), "eventnum", PadMapping[i].eventnum); file.Set(SectionName.c_str(), "eventnum", PadMapping[i].eventnum);
file.Set(SectionName.c_str(), "Diagonal", PadMapping[i].SDiagonal); file.Set(SectionName.c_str(), "Diagonal", PadMapping[i].SDiagonal);
file.Set(SectionName.c_str(), "SquareToCircle", PadMapping[i].bSquareToCircle); file.Set(SectionName.c_str(), "SquareToCircle", PadMapping[i].bSquareToCircle);
file.Set(SectionName.c_str(), "CheckForFocus", g_Config.bCheckFocus);
// ====================================== // ======================================
// Debugging // Debugging
@ -189,6 +189,7 @@ void Config::Load(bool ChangePad, bool ChangeSaveByID)
// Global settings // Global settings
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
file.Get("General", "ShowAdvanced", &g_Config.bShowAdvanced, false); file.Get("General", "ShowAdvanced", &g_Config.bShowAdvanced, false);
file.Get("General", "CheckForFocus", &g_Config.bCheckFocus, false);
if(!ChangeSaveByID) if(!ChangeSaveByID)
{ {
file.Get("General", "SaveByID", &Tmp, false); g_Config.bSaveByID = Tmp; file.Get("General", "SaveByID", &Tmp, false); g_Config.bSaveByID = Tmp;
@ -247,7 +248,6 @@ void Config::Load(bool ChangePad, bool ChangeSaveByID)
file.Get(SectionName.c_str(), "Diagonal", &PadMapping[i].SDiagonal, "100%"); file.Get(SectionName.c_str(), "Diagonal", &PadMapping[i].SDiagonal, "100%");
file.Get(SectionName.c_str(), "SquareToCircle", &Tmp, false); PadMapping[i].bSquareToCircle = Tmp; file.Get(SectionName.c_str(), "SquareToCircle", &Tmp, false); PadMapping[i].bSquareToCircle = Tmp;
file.Get(SectionName.c_str(), "CheckForFocus", &g_Config.bCheckFocus, false);
// ============================= // =============================
// Debugging // Debugging

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

@ -825,7 +825,7 @@ void ConfigBox::CreateGUIControls()
, i+1 , i+1
)); ));
m_CBCheckFocus[i]->SetToolTip(wxT( m_CBCheckFocus[i]->SetToolTip(wxT(
"Allow Gamepad input even when Dolphin is not in focus. Out of focus keyboard input is never allowed.")); "Allow gamepad input even when Dolphin is not in focus. Out of focus keyboard input is never allowed."));
// Populate settings // Populate settings
m_sSettings[i] = new wxBoxSizer ( wxHORIZONTAL ); m_sSettings[i] = new wxBoxSizer ( wxHORIZONTAL );