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

Njoy can now be build with wxUSE_UNICODE 1 on windows

Browse Source 
move all static ini paths to Common

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3896 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
LPFaint99
2009-07-28 08:27:45 +00:00
parent 989e5b7798
commit 22427f89bc
16 changed files with 96 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Plugins/Plugin_Wiimote/Src/Config.cpp
View File

@ -216,7 +216,7 @@ void Config::Load(bool ChangePad)
{
std::string temp;
IniFile iniFile;
iniFile.Load(FULL_CONFIG_DIR "Wiimote.ini");
iniFile.Load(WM_CONFIG_FILE);
// General
iniFile.Get("Settings", "SidewaysDPad", &bSidewaysDPad, false);
@ -296,7 +296,7 @@ void Config::Load(bool ChangePad)
iniFile.Get(joySectionName.c_str(), "PitchInvert", &WiiMoteEmu::PadMapping[i].bPitchInvert, false);
}
// Load the IR cursor settings if it's avaliable for the GameId, if not load the default settings
iniFile.Load(FULL_CONFIG_DIR "IR Pointer.ini");
iniFile.Load(WM_IR_CONFIG_FILE);
char TmpSection[32];
sprintf(TmpSection, "%s", g_ISOId ? Hex2Ascii(g_ISOId).c_str() : "Default");
iniFile.Get(TmpSection, "IRLeft", &iIRLeft, LEFT);
@ -307,7 +307,7 @@ void Config::Load(bool ChangePad)
// Load a few screen settings to. If these are added to the DirectX plugin it's probably
// better to place them in the main Dolphin.ini file
iniFile.Load(FULL_CONFIG_DIR "gfx_opengl.ini");
iniFile.Load(OPENGL_CONFIG_FILE);
iniFile.Get("Settings", "KeepAR_4_3", &bKeepAR43, false);
iniFile.Get("Settings", "KeepAR_16_9", &bKeepAR169, false);
iniFile.Get("Settings", "Crop", &bCrop, false);
@ -318,7 +318,7 @@ void Config::Load(bool ChangePad)
void Config::Save(int Slot)
{
IniFile iniFile;
iniFile.Load(FULL_CONFIG_DIR "Wiimote.ini");
iniFile.Load(WM_CONFIG_FILE);
iniFile.Set("Settings", "SidewaysDPad", bSidewaysDPad);
iniFile.Set("Settings", "ExtensionConnected", iExtensionConnected);
@ -395,17 +395,17 @@ void Config::Save(int Slot)
iniFile.Set(joySectionName.c_str(), "PitchInvert", WiiMoteEmu::PadMapping[i].bPitchInvert);
}
iniFile.Save(FULL_CONFIG_DIR "Wiimote.ini");
iniFile.Save(WM_CONFIG_FILE);
// Save the IR cursor settings if it's avaliable for the GameId, if not save the default settings
iniFile.Load(FULL_CONFIG_DIR "IR Pointer.ini");
iniFile.Load(WM_IR_CONFIG_FILE);
char TmpSection[32];
sprintf(TmpSection, "%s", g_ISOId ? Hex2Ascii(g_ISOId).c_str() : "Default");
iniFile.Set(TmpSection, "IRLeft", iIRLeft);
iniFile.Set(TmpSection, "IRTop", iIRTop);
iniFile.Set(TmpSection, "IRWidth", iIRWidth);
iniFile.Set(TmpSection, "IRHeight", iIRHeight);
iniFile.Save(FULL_CONFIG_DIR "IR Pointer.ini");
iniFile.Save(WM_IR_CONFIG_FILE);
//INFO_LOG(CONSOLE, "Save()\n");
}

10
Source/Plugins/Plugin_Wiimote/Src/ConfigRecording.cpp
View File

@ -32,7 +32,7 @@ void WiimoteRecordingConfigDialog::LoadFile()
INFO_LOG(CONSOLE, "LoadFile()\n");
IniFile file;
file.Load(FULL_CONFIG_DIR "WiimoteMovement.ini");
file.Load(WM_MOVEMENT_CONFIG_FILE);
for (int i = 1; i < (RECORDING_ROWS + 1); i++)
{
@ -75,7 +75,7 @@ void WiimoteRecordingConfigDialog::SaveFile()
INFO_LOG(CONSOLE, "SaveFile\n");
IniFile file;
file.Load(FULL_CONFIG_DIR "WiimoteMovement.ini");
file.Load(WM_MOVEMENT_CONFIG_FILE);
for(int i = 1; i < (RECORDING_ROWS + 1); i++)
{
@ -107,7 +107,7 @@ void WiimoteRecordingConfigDialog::SaveFile()
file.Set(SaveName.c_str(), "PlaybackSpeed", m_RecordPlayBackSpeed[i]->GetSelection());
}
file.Save(FULL_CONFIG_DIR "WiimoteMovement.ini");
file.Save(WM_MOVEMENT_CONFIG_FILE);
INFO_LOG(CONSOLE, "SaveFile()\n");
}
@ -338,7 +338,7 @@ void WiimoteRecordingConfigDialog::CreateGUIControlsRecording()
void WiimoteRecordingConfigDialog::ConvertToString()
{
IniFile file;
file.Load(FULL_CONFIG_DIR "WiimoteMovement.ini");
file.Load(WM_MOVEMENT_CONFIG_FILE);
std::string TmpStr = "", TmpIR = "", TmpTime = "";
for (int i = 0; i < (int)m_vRecording.size(); i++)
@ -402,7 +402,7 @@ void WiimoteRecordingConfigDialog::ConvertToString()
m_RecordPlayBackSpeed[m_iRecordTo]->SetSelection(3);
}
file.Save(FULL_CONFIG_DIR "WiimoteMovement.ini");
file.Save(WM_MOVEMENT_CONFIG_FILE);
INFO_LOG(CONSOLE, "Save recording to WiimoteMovement.ini\n");
}

2
Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp
View File

@ -186,7 +186,7 @@ void LoadRecordedMovements()
INFO_LOG(WII_IPC_WIIMOTE, "LoadRecordedMovements()\n");
IniFile file;
file.Load(FULL_CONFIG_DIR "WiimoteMovement.ini");
file.Load(WM_MOVEMENT_CONFIG_FILE);
for(int i = 0; i < RECORDING_ROWS; i++)
{