From 512053fa5e06e20ed63e32aa30429a55a02e7d67 Mon Sep 17 00:00:00 2001 From: hrydgard Date: Sun, 13 Sep 2009 08:54:46 +0000 Subject: Kill some horribly ugly hackery :( It's just not right to pass entire IniFile objects across DLLs. Only POD (plain-old-data, like int, float, char, char[] etc) are safe to pass across DLL boundaries. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4257 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/Src/Config.cpp | 46 ++++++++++------------------------ 1 file changed, 13 insertions(+), 33 deletions(-) (limited to 'Source/Core/VideoCommon/Src/Config.cpp') diff --git a/Source/Core/VideoCommon/Src/Config.cpp b/Source/Core/VideoCommon/Src/Config.cpp index 0168715263..331c91aed0 100644 --- a/Source/Core/VideoCommon/Src/Config.cpp +++ b/Source/Core/VideoCommon/Src/Config.cpp @@ -105,40 +105,20 @@ void Config::Load(const char *ini_file) SetEnableAlert(bTmp); } -void Config::GameIniLoad(IniFile *iniFile) +void Config::GameIniLoad(const char *ini_file) { - if (! iniFile) - return; - - if (iniFile->Exists("Video", "ForceFiltering")) - iniFile->Get("Video", "ForceFiltering", &bForceFiltering, 0); - - if (iniFile->Exists("Video", "MaxAnisotropy")) - iniFile->Get("Video", "MaxAnisotropy", &iMaxAnisotropy, 3); // NOTE - this is x in (1 << x) - - if (iniFile->Exists("Video", "EFBCopyDisable")) - iniFile->Get("Video", "EFBCopyDisable", &bEFBCopyDisable, 0); - - if (iniFile->Exists("Video", "EFBCopyDisableHotKey")) - iniFile->Get("Video", "EFBCopyDisableHotKey", &bEFBCopyDisableHotKey, 0); - - if (iniFile->Exists("Video", "EFBToRAMEnable")) - iniFile->Get("Video", "EFBToRAMEnable", &bCopyEFBToRAM, 0); - - if (iniFile->Exists("Video", "SafeTextureCache")) - iniFile->Get("Video", "SafeTextureCache", &bSafeTextureCache, false); - - if (iniFile->Exists("Video", "MSAA")) - iniFile->Get("Video", "MSAA", &iMultisampleMode, 0); - - if (iniFile->Exists("Video", "DstAlphaPass")) - iniFile->Get("Video", "DstAlphaPass", &bDstAlphaPass, false); - - if (iniFile->Exists("Video", "UseXFB")) - iniFile->Get("Video", "UseXFB", &bUseXFB, 0); - - if (iniFile->Exists("Video", "ProjectionHack")) - iniFile->Get("Video", "ProjectionHack", &iPhackvalue, 0); + IniFile iniFile; + iniFile.Load(ini_file); + iniFile.Get("Video", "ForceFiltering", &bForceFiltering, 0); + iniFile.Get("Video", "MaxAnisotropy", &iMaxAnisotropy, 3); // NOTE - this is x in (1 << x) + iniFile.Get("Video", "EFBCopyDisable", &bEFBCopyDisable, 0); + iniFile.Get("Video", "EFBCopyDisableHotKey", &bEFBCopyDisableHotKey, 0); + iniFile.Get("Video", "EFBToRAMEnable", &bCopyEFBToRAM, 0); + iniFile.Get("Video", "SafeTextureCache", &bSafeTextureCache, false); + iniFile.Get("Video", "MSAA", &iMultisampleMode, 0); + iniFile.Get("Video", "DstAlphaPass", &bDstAlphaPass, false); + iniFile.Get("Video", "UseXFB", &bUseXFB, 0); + iniFile.Get("Video", "ProjectionHack", &iPhackvalue, 0); } void Config::Save(const char *ini_file) -- cgit v1.2.3