From 9d786b6440bce0f88e7068867e711d35daea186e Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Thu, 8 Apr 2010 13:41:35 +0000
Subject: [PATCH] Stable: another small HLE fix

git-svn-id: https://dolphin-emu.googlecode.com/svn/branches/stable@5294 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp | 8 ++++++++
 Source/Plugins/Plugin_DSP_HLE/Src/Config.h   | 5 +++++
 Source/Plugins/Plugin_DSP_HLE/Src/main.cpp   | 5 +++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp
index 48da157aaf..d3178e211d 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp
@@ -36,6 +36,7 @@ void CConfig::Load()
 	file.Load((std::string(File::GetUserPath(D_CONFIG_IDX)) + "DSP.ini").c_str());
 	file.Get("Config", "EnableHLEAudio", &m_EnableHLEAudio, true); // Sound Settings
 	file.Get("Config", "EnableRE0AudioFix", &m_EnableRE0Fix, false); // RE0 Hack
+	m_RE0Fix = m_EnableRE0Fix;
 	ac_Config.Load(file);
 }
 
@@ -49,3 +50,10 @@ void CConfig::Save()
 
 	file.Save((std::string(File::GetUserPath(D_CONFIG_IDX)) + "DSP.ini").c_str());
 }
+
+void CConfig::LoadGameIni(const char* gameIniPath)
+{
+	IniFile gameIni;
+	gameIni.Load(gameIniPath);
+	gameIni.Get("HLEaudio", "UseRE0Fix", &m_RE0Fix, m_EnableRE0Fix);
+}
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Config.h b/Source/Plugins/Plugin_DSP_HLE/Src/Config.h
index 68e7f70326..9a55711da2 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/Config.h
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/Config.h
@@ -23,12 +23,17 @@
 struct CConfig
 {
     bool m_EnableHLEAudio;
+	//is the RE0 fix enabled in config?
 	bool m_EnableRE0Fix;
+	//is the RE0 supposed to be used?
+	//this value includes game.ini, avoiding overwrite of config
+	bool m_RE0Fix;
 
     CConfig();
     
     void Load();
     void Save();
+	void LoadGameIni(const char*);
 };
 
 extern CConfig g_Config;
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
index c90f9f209b..199f1d14d6 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
@@ -142,8 +142,9 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
 
 void SetDllGlobals(PLUGIN_GLOBALS* _pPluginGlobals)
 {
-       globals = _pPluginGlobals;
-       LogManager::SetInstance((LogManager *)globals->logManager);
+	globals = _pPluginGlobals;
+	LogManager::SetInstance((LogManager *)globals->logManager);
+	g_Config.LoadGameIni(globals->game_ini);
 }
 
 void DllConfig(HWND _hParent)