From ff62f492e63bac88017fcd91d919a6f09bdbaa1a Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sun, 27 Feb 2011 14:43:52 +0000 Subject: [PATCH] Remove numerous video options from the ISO properties. Use the new configuration profile system instead. Thanks to kostamarino for migrating the game inis to the new system :) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7259 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 97 +-------------------- Source/Core/DolphinWX/Src/ISOProperties.h | 13 +-- 2 files changed, 2 insertions(+), 108 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index df9637ea8e..ac78c0b57b 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -328,16 +328,8 @@ void CISOProperties::CreateGUIControls(bool IsWad) EnableProgressiveScan = new wxCheckBox(m_GameConfig, ID_ENABLEPROGRESSIVESCAN, _("Enable Progressive Scan"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); // Video - ForceFiltering = new wxCheckBox(m_GameConfig, ID_FORCEFILTERING, _("Force Filtering"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - EFBCopyEnable = new wxCheckBox(m_GameConfig, ID_EFBCOPYENABLE, _("Enable Copy to EFB"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - EFBAccessEnable = new wxCheckBox(m_GameConfig, ID_EFBACCESSENABLE, _("Enable CPU Access"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - EFBToTextureEnable = new wxCheckBox(m_GameConfig, ID_EFBTOTEXTUREENABLE, _("Enable EFB To Texture"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - SafeTextureCache = new wxCheckBox(m_GameConfig, ID_SAFETEXTURECACHE, _("Accurate Texture Cache"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - DstAlphaPass = new wxCheckBox(m_GameConfig, ID_DSTALPHAPASS, _("Distance Alpha Pass"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); - UseXFB = new wxCheckBox(m_GameConfig, ID_USEXFB, _("Use XFB"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); UseZTPSpeedupHack = new wxCheckBox(m_GameConfig, ID_ZTP_SPEEDUP, _("ZTP hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); UseZTPSpeedupHack->SetToolTip(_("Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game.")); - DListCache = new wxCheckBox(m_GameConfig, ID_DLISTCACHE, _("DList Cache"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); // Hack szrPHackSettings = new wxFlexGridSizer(0); @@ -388,15 +380,7 @@ void CISOProperties::CreateGUIControls(bool IsWad) sbWiiOverrides->Add(EnableWideScreen, 0, wxLEFT, 5); sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video")); - sbVideoOverrides->Add(ForceFiltering, 0, wxLEFT, 5); - sbVideoOverrides->Add(EFBCopyEnable, 0, wxLEFT, 5); - sbVideoOverrides->Add(EFBAccessEnable, 0, wxLEFT, 5); - sbVideoOverrides->Add(EFBToTextureEnable, 0, wxLEFT, 5); - sbVideoOverrides->Add(SafeTextureCache, 0, wxLEFT, 5); - sbVideoOverrides->Add(DstAlphaPass, 0, wxLEFT, 5); - sbVideoOverrides->Add(UseXFB, 0, wxLEFT, 5); sbVideoOverrides->Add(UseZTPSpeedupHack, 0, wxLEFT, 5); - sbVideoOverrides->Add(DListCache, 0, wxLEFT, 5); szrPHackSettings->Add(PHackEnable, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5); szrPHackSettings->Add(PHSettings, 0, wxLEFT, 5); @@ -889,56 +873,17 @@ void CISOProperties::LoadGameConfig() else EnableProgressiveScan->Set3StateValue(wxCHK_UNDETERMINED); + // ?? if (GameIni.Get("Wii", "Widescreen", &bTemp)) EnableWideScreen->Set3StateValue((wxCheckBoxState)bTemp); else EnableWideScreen->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Video", "ForceFiltering", &bTemp)) - ForceFiltering->Set3StateValue((wxCheckBoxState)bTemp); - else - ForceFiltering->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Video", "EFBCopyEnable", &bTemp)) - EFBCopyEnable->Set3StateValue((wxCheckBoxState)bTemp); - else - EFBCopyEnable->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Video", "EFBAccessEnable", &bTemp)) - EFBAccessEnable->Set3StateValue((wxCheckBoxState)bTemp); - else - EFBAccessEnable->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Video", "EFBToTextureEnable", &bTemp)) - EFBToTextureEnable->Set3StateValue((wxCheckBoxState)bTemp); - else - EFBToTextureEnable->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Video", "SafeTextureCache", &bTemp)) - SafeTextureCache->Set3StateValue((wxCheckBoxState)bTemp); - else - SafeTextureCache->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Video", "DstAlphaPass", &bTemp)) - DstAlphaPass->Set3StateValue((wxCheckBoxState)bTemp); - else - DstAlphaPass->Set3StateValue(wxCHK_UNDETERMINED); - - if (GameIni.Get("Video", "UseXFB", &bTemp)) - UseXFB->Set3StateValue((wxCheckBoxState)bTemp); - else - UseXFB->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Video", "ZTPSpeedupHack", &bTemp)) UseZTPSpeedupHack->Set3StateValue((wxCheckBoxState)bTemp); else UseZTPSpeedupHack->Set3StateValue(wxCHK_UNDETERMINED); - if (GameIni.Get("Video", "DlistCachingEnable", &bTemp)) - DListCache->Set3StateValue((wxCheckBoxState)bTemp); - else - DListCache->Set3StateValue(wxCHK_UNDETERMINED); - GameIni.Get("Video", "ProjectionHack", &bTemp); PHackEnable->Set3StateValue((wxCheckBoxState)bTemp); PHSettings->Enable(bTemp); @@ -1023,51 +968,11 @@ bool CISOProperties::SaveGameConfig() else GameIni.Set("Wii", "Widescreen", EnableWideScreen->Get3StateValue()); - if (ForceFiltering->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Video", "ForceFiltering"); - else - GameIni.Set("Video", "ForceFiltering", ForceFiltering->Get3StateValue()); - - if (EFBCopyEnable->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Video", "EFBCopyEnable"); - else - GameIni.Set("Video", "EFBCopyEnable", EFBCopyEnable->Get3StateValue()); - - if (EFBAccessEnable->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Video", "EFBAccessEnable"); - else - GameIni.Set("Video", "EFBAccessEnable", EFBAccessEnable->Get3StateValue()); - - if (EFBToTextureEnable->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Video", "EFBToTextureEnable"); - else - GameIni.Set("Video", "EFBToTextureEnable", EFBToTextureEnable->Get3StateValue()); - - if (SafeTextureCache->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Video", "SafeTextureCache"); - else - GameIni.Set("Video", "SafeTextureCache", SafeTextureCache->Get3StateValue()); - - if (DstAlphaPass->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Video", "DstAlphaPass"); - else - GameIni.Set("Video", "DstAlphaPass", DstAlphaPass->Get3StateValue()); - - if (UseXFB->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Video", "UseXFB"); - else - GameIni.Set("Video", "UseXFB", UseXFB->Get3StateValue()); - if (UseZTPSpeedupHack->Get3StateValue() == wxCHK_UNDETERMINED) GameIni.DeleteKey("Video", "ZTPSpeedupHack"); else GameIni.Set("Video", "ZTPSpeedupHack", UseZTPSpeedupHack->Get3StateValue()); - if (DListCache->Get3StateValue() == wxCHK_UNDETERMINED) - GameIni.DeleteKey("Video", "DlistCachingEnable"); - else - GameIni.Set("Video", "DlistCachingEnable", DListCache->Get3StateValue()); - GameIni.Set("Video", "ProjectionHack", PHackEnable->Get3StateValue()); GameIni.Set("Video", "PH_SZNear", PHack_Data.PHackSZNear ? 1 : 0); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h index ba22e7424e..51900676a6 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.h +++ b/Source/Core/DolphinWX/Src/ISOProperties.h @@ -100,10 +100,7 @@ class CISOProperties : public wxDialog // Wii wxCheckBox *EnableProgressiveScan, *EnableWideScreen; // Video - wxCheckBox *ForceFiltering, - *EFBCopyEnable, *EFBAccessEnable, *EFBToTextureEnable, - *SafeTextureCache, *DstAlphaPass, *UseXFB, *UseZTPSpeedupHack, - *DListCache, *PHackEnable; + wxCheckBox *UseZTPSpeedupHack, *PHackEnable; wxButton *PHSettings; wxButton *EditConfig; @@ -182,15 +179,7 @@ class CISOProperties : public wxDialog ID_DISCSPEED, ID_MERGEBLOCKS, ID_AUDIO_DSP_HLE, - ID_FORCEFILTERING, - ID_EFBCOPYENABLE, - ID_EFBACCESSENABLE, - ID_EFBTOTEXTUREENABLE, - ID_SAFETEXTURECACHE, - ID_DSTALPHAPASS, - ID_USEXFB, ID_ZTP_SPEEDUP, - ID_DLISTCACHE, ID_PHACKENABLE, ID_PHSETTINGS, ID_ENABLEPROGRESSIVESCAN,