From 9ad464377ac9ce7b1f2f3b0c5855ac726019e85a Mon Sep 17 00:00:00 2001 From: tmkkmac Date: Sat, 14 Mar 2009 18:50:46 +0000 Subject: [PATCH] Removed a VU Clip gamefix. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@784 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/include/Pcsx2Config.h | 1 - pcsx2/windows/WinMain.cpp | 2 -- pcsx2/windows/pcsx2.rc | 14 ++++++-------- pcsx2/x86/iVUzerorec.cpp | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/common/include/Pcsx2Config.h b/common/include/Pcsx2Config.h index 0d7b930b56..c7fbdbea3b 100644 --- a/common/include/Pcsx2Config.h +++ b/common/include/Pcsx2Config.h @@ -65,7 +65,6 @@ extern SessionOverrideFlags g_Session; #define CHECK_ESCAPE_HACK (Config.Hacks & 0x400) //------------ SPECIAL GAME FIXES!!! --------------- #define CHECK_VUADDSUBHACK (Config.GameFixes & 0x1) // Special Fix for Tri-ace games, they use an encryption algorithm that requires VU addi opcode to be bit-accurate. -#define CHECK_VUCLIPFLAGHACK (Config.GameFixes & 0x2) // Special Fix for God of War, fixes SPS. #define CHECK_FPUCOMPAREHACK (Config.GameFixes & 0x4) // Special Fix for Digimon Rumble Arena 2, fixes spinning/hanging on intro-menu. #define CHECK_FPUMULHACK (Config.GameFixes & 0x8) // Special Fix for Tales of Destiny hangs. //------------ Advanced Options!!! --------------- diff --git a/pcsx2/windows/WinMain.cpp b/pcsx2/windows/WinMain.cpp index e1dd5a4e83..0b8dbfd2ec 100644 --- a/pcsx2/windows/WinMain.cpp +++ b/pcsx2/windows/WinMain.cpp @@ -525,7 +525,6 @@ BOOL APIENTRY GameFixes(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) case WM_INITDIALOG: if(Config.GameFixes & 0x1) CheckDlgButton(hDlg, IDC_GAMEFIX2, TRUE);//Tri-Ace fix if(Config.GameFixes & 0x4) CheckDlgButton(hDlg, IDC_GAMEFIX3, TRUE);//Digimon FPU compare fix - if(Config.GameFixes & 0x2) CheckDlgButton(hDlg, IDC_GAMEFIX4, TRUE);//GoW fix if(Config.GameFixes & 0x8) CheckDlgButton(hDlg, IDC_GAMEFIX5, TRUE);//Tales of Destiny fix return TRUE; @@ -535,7 +534,6 @@ BOOL APIENTRY GameFixes(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) uint newfixes = 0; newfixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX2) ? 0x1 : 0; newfixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX3) ? 0x4 : 0; - newfixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX4) ? 0x2 : 0; newfixes |= IsDlgButtonChecked(hDlg, IDC_GAMEFIX5) ? 0x8 : 0; EndDialog(hDlg, TRUE); diff --git a/pcsx2/windows/pcsx2.rc b/pcsx2/windows/pcsx2.rc index c1792704d7..523f912ea4 100644 --- a/pcsx2/windows/pcsx2.rc +++ b/pcsx2/windows/pcsx2.rc @@ -74,21 +74,19 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN // Dialog // -IDD_GAMEFIXES DIALOGEX 0, 0, 279, 132 +IDD_GAMEFIXES DIALOGEX 0, 0, 279, 118 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Game Special Fixes" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "OK",IDOK,87,105,50,14 - PUSHBUTTON "Cancel",IDCANCEL,142,105,50,14 + DEFPUSHBUTTON "OK",IDOK,87,89,50,14 + PUSHBUTTON "Cancel",IDCANCEL,142,89,50,14 CTEXT "Some games need special settings.\nConfigure them here.",IDC_STATIC,7,7,265,17 - GROUPBOX "PCSX2 Gamefixes",IDC_STATIC,7,28,265,97 + GROUPBOX "PCSX2 Gamefixes",IDC_STATIC,7,28,265,83 CONTROL "FPU Compare Hack - Special fix for Digimon Rumble Arena 2.",IDC_GAMEFIX3, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,43,249,10 CONTROL "VU Add Hack - Special fix for Tri-Ace games!",IDC_GAMEFIX2, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,72,252,10 - CONTROL "VU Clip Hack - Special fix for God of War",IDC_GAMEFIX4, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,86,238,10 CONTROL "FPU Mul Hack - Special fix for Tales of Destiny (possibly other games).",IDC_GAMEFIX5, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,57,249,10 END @@ -108,8 +106,8 @@ BEGIN RIGHTMARGIN, 272 VERTGUIDE, 14 TOPMARGIN, 7 - BOTTOMMARGIN, 125 - HORZGUIDE, 119 + BOTTOMMARGIN, 111 + HORZGUIDE, 103 END END #endif // APSTUDIO_INVOKED diff --git a/pcsx2/x86/iVUzerorec.cpp b/pcsx2/x86/iVUzerorec.cpp index e8e4b06efb..f4998b113e 100644 --- a/pcsx2/x86/iVUzerorec.cpp +++ b/pcsx2/x86/iVUzerorec.cpp @@ -3000,7 +3000,7 @@ void VuInstruction::Recompile(list::iterator& itinst, u32 vuxyz) if( type & INST_CLIP_WRITE ) { if( nParentPc < s_pCurBlock->startpc || nParentPc >= (int)pc ) { - if( !CHECK_VUCLIPFLAGHACK && pparentinst != NULL ) { + if( pparentinst != NULL ) { if( nParentCheckForExecution >= 0 ) { if( pparentinst->pClipWrite == 0 )