From 962fef0626537315faf63b8f0e48bb6fba9b8211 Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 2 Apr 2010 21:28:56 +0000 Subject: [PATCH] Fixed bug where the projection hack setting was not being saved in the Game Properties dialog. Removed the obsolete projection hacks: * Final Fantasy CC Echo of Time * Harvest Moon Magical Melody * Baten Kaitos * Baten Kaitos Origin * Skies of Arcadia git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5271 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/ISOProperties.cpp | 7 +------ Source/Core/VideoCommon/Src/VertexShaderManager.cpp | 2 ++ Source/Core/VideoCommon/Src/VertexShaderManager.h | 5 ----- Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp | 5 ----- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index f95dc701a3..330f219ddf 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -314,11 +314,6 @@ void CISOProperties::CreateGUIControls(bool IsWad) arrayStringFor_Hack.Add(_("Zelda Twilight Princess Bloom hack")); arrayStringFor_Hack.Add(_("Sonic and the Black Knight")); arrayStringFor_Hack.Add(_("Bleach Versus Crusade")); - arrayStringFor_Hack.Add(_("Final Fantasy CC Echo of Time")); - arrayStringFor_Hack.Add(_("Harvest Moon Magical Melody")); - arrayStringFor_Hack.Add(_("Baten Kaitos")); - arrayStringFor_Hack.Add(_("Baten Kaitos Origin")); - arrayStringFor_Hack.Add(_("Skies of Arcadia")); Hack = new wxChoice(m_GameConfig, ID_HACK, wxDefaultPosition, wxDefaultSize, arrayStringFor_Hack, 0, wxDefaultValidator); @@ -942,7 +937,7 @@ bool CISOProperties::SaveGameConfig() else GameIni.Set("Video", "FIFOBPHack", BPHack->Get3StateValue()); - if (EmuState->GetSelection() == -1) + if (Hack->GetSelection() == -1) GameIni.DeleteKey("Video", "ProjectionHack"); else GameIni.Set("Video", "ProjectionHack", Hack->GetSelection()); diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp index aaead44589..7f6ca0b271 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp @@ -90,6 +90,7 @@ void UpdateProjectionHack(int iPhackvalue) bPhackvalue1 = 0; bProjHack1 = 0; break; +/* // Unused - kept for reference case PROJECTION_HACK_FINAL_FANTASY_CC_ECHO_OF_TIME: bPhackvalue1 = 1; fhackvalue1 = 0.8f; @@ -123,6 +124,7 @@ void UpdateProjectionHack(int iPhackvalue) bPhackvalue2 = 0; bProjHack1 = 0; break; +*/ } // Set the projections hacks diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.h b/Source/Core/VideoCommon/Src/VertexShaderManager.h index 14fc1e347b..05d3f7ae87 100644 --- a/Source/Core/VideoCommon/Src/VertexShaderManager.h +++ b/Source/Core/VideoCommon/Src/VertexShaderManager.h @@ -26,11 +26,6 @@ enum PROJECTION_HACK_ZELDA_TP_BLOOM_HACK = 1, PROJECTION_HACK_SONIC_AND_THE_BLACK_KNIGHT = 2, PROJECTION_HACK_BLEACH_VERSUS_CRUSADE = 3, - PROJECTION_HACK_FINAL_FANTASY_CC_ECHO_OF_TIME = 4, - PROJECTION_HACK_HARVESTMOON_MM = 5, - PROJECTION_HACK_BATEN_KAITOS = 6, - PROJECTION_HACK_BATEN_KAITOS_ORIGIN = 7, - PROJECTION_HACK_SKIES_OF_ARCADIA = 8 }; struct ProjectionHack diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp index 90aa434f4f..5e70bb80d4 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp @@ -206,11 +206,6 @@ void GFXConfigDialogOGL::InitializeGUILists() arrayStringFor_PhackvalueCB.Add(wxT("Zelda Twilight Princess Bloom hack")); arrayStringFor_PhackvalueCB.Add(wxT("Sonic and the Black Knight")); arrayStringFor_PhackvalueCB.Add(wxT("Bleach Versus Crusade")); - arrayStringFor_PhackvalueCB.Add(wxT("Final Fantasy CC Echo of Time")); - arrayStringFor_PhackvalueCB.Add(wxT("Harvest Moon Magical Melody")); - arrayStringFor_PhackvalueCB.Add(wxT("Baten Kaitos")); - arrayStringFor_PhackvalueCB.Add(wxT("Baten Kaitos Origin")); - arrayStringFor_PhackvalueCB.Add(wxT("Skies of Arcadia")); } void GFXConfigDialogOGL::InitializeGUIValues()