piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

revert part of r3896

Browse Source 
bad decision to move all ini paths to common

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3897 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
LPFaint99
2009-07-28 16:20:54 +00:00
parent 22427f89bc
commit cec4b65512
12 changed files with 43 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Source/Core/Common/Src/CommonPaths.h
View File

@ -82,24 +82,11 @@
#define WII_SYS_DIR "Wii"
// Filenames
#define DOLPHIN_CONFIG "Dolphin.ini"
#define DEBUGGER_CONFIG "Debugger.ini"
#define BREAKPOINT_CONFIG "BreakPoints.ini"
#define MEMCHECKS_CONFIG "MemoryChecks.ini"
#define LOGGER_CONFIG "Logger.ini"
#define DX9_CONFIG "gfx_dx9.ini"
#define OPENGL_CONFIG "gfx_opengl.ini"
#define DSPHLE_CONFIG "DSP.ini"
#define DSPLLE_CONFIG "DSPLLE.ini"
#define NJOY_CONFIG "nJoy.ini"
#define PSIMPLE_CONFIG "pad.ini"
#define WM_CONFIG "Wiimote.ini"
#define WM_IR_CONFIG "IR Pointer.ini"
#define WM_MOVEMENT_CONFIG "WiimoteMovement.ini"
#define TOTALDB "totaldb.dsy"
#define MAIN_LOG "dolphin.log"
#define DOLPHIN_CONFIG "Dolphin.ini"
#define DEBUGGER_CONFIG "Debugger.ini"
#define LOGGER_CONFIG "Logger.ini"
#define TOTALDB "totaldb.dsy"
#define MAIN_LOG "dolphin.log"
#define DEFAULT_GFX_PLUGIN PLUGIN_PREFIX "Plugin_VideoOGL" PLUGIN_SUFFIX
#define DEFAULT_DSP_PLUGIN PLUGIN_PREFIX "Plugin_DSP_HLE" PLUGIN_SUFFIX
@ -167,18 +154,6 @@
#define CONFIG_FILE FULL_CONFIG_DIR DOLPHIN_CONFIG
#define DEBUGGER_CONFIG_FILE FULL_CONFIG_DIR DEBUGGER_CONFIG
#define LOGGER_CONFIG_FILE FULL_CONFIG_DIR LOGGER_CONFIG
#define BREAKPOINT_CONFIG_FILE FULL_GAMECONFIG_DIR BREAKPOINT_CONFIG
#define MEMCHECKS_CONFIG_FILE FULL_GAMECONFIG_DIR MEMCHECKS_CONFIG
#define DX9_CONFIG_FILE FULL_CONFIG_DIR DX9_CONFIG
#define OPENGL_CONFIG_FILE FULL_CONFIG_DIR OPENGL_CONFIG
#define DSPHLE_CONFIG_FILE FULL_CONFIG_DIR DSPHLE_CONFIG
#define DSPLLE_CONFIG_FILE FULL_CONFIG_DIR DSPLLE_CONFIG
#define NJOY_CONFIG_FILE FULL_CONFIG_DIR NJOY_CONFIG
#define PSIMPLE_CONFIG_FILE FULL_CONFIG_DIR PSIMPLE_CONFIG
#define WM_CONFIG_FILE FULL_CONFIG_DIR WM_CONFIG
#define WM_IR_CONFIG_FILE FULL_CONFIG_DIR WM_IR_CONFIG
#define WM_MOVEMENT_CONFIG_FILE FULL_CONFIG_DIR WM_MOVEMENT_CONFIG
#define TOTALDB_FILE FULL_SYSDATA_DIR TOTALDB
#define MAINRAM_DUMP_FILE FULL_DUMP_DIR RAM_DUMP

2
Source/Core/Core/Src/ConfigManager.cpp
View File

@ -258,7 +258,7 @@ void SConfig::LoadSettingsHLE()
{
IniFile ini;
//
ini.Load(DSPHLE_CONFIG_FILE);
ini.Load(FULL_CONFIG_DIR "DSP.ini");
ini.Get("Config", "EnableRE0AudioFix", &m_EnableRE0Fix, false); // RE0 Hack
}

8
Source/Core/DebuggerWX/Src/BreakpointWindow.cpp
View File

@ -226,7 +226,7 @@ CBreakPointWindow::OnAddBreakPointMany(wxCommandEvent& event)
{
// load ini
IniFile ini;
std::string filename = std::string(BREAKPOINT_CONFIG_FILE);
std::string filename = std::string(FULL_GAMECONFIG_DIR "BreakPoints.ini");
if (ini.Load(filename.c_str())) // check if there is any file there
{
@ -252,7 +252,7 @@ CBreakPointWindow::OnAddBreakPointMany(wxCommandEvent& event)
}
else
{
wxMessageBox(_T("You have no "BREAKPOINT_CONFIG_FILE " file"));
wxMessageBox(_T("You have no GameIni/BreakPoints.ini file"));
}
}
@ -275,7 +275,7 @@ CBreakPointWindow::OnAddMemoryCheckMany(wxCommandEvent& event)
{
// load ini
IniFile ini;
std::string filename = std::string(MEMCHECKS_CONFIG_FILE);
std::string filename = std::string(FULL_GAMECONFIG_DIR "MemoryChecks.ini");
if (ini.Load(filename.c_str()))
{
@ -354,7 +354,7 @@ CBreakPointWindow::OnAddMemoryCheckMany(wxCommandEvent& event)
}
else
{
wxMessageBox(_T("You have no " MEMCHECKS_CONFIG_FILE " file"));
wxMessageBox(_T("You have no " FULL_GAMECONFIG_DIR "MemoryChecks.ini file"));
}
}
// =================