From 1db79d7eeaddc577a6157be1715d470fc666991f Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Fri, 13 Nov 2009 10:53:26 +0000
Subject: [PATCH] Remove the MPEG hack; Mana Khemia no longer needs it, as of
 the voodoo cycle fixes.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2194 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/Config.h                      | 6 ++----
 pcsx2/IPU/mpeg2lib/Mpeg.cpp         | 9 ++++++---
 pcsx2/Pcsx2Config.cpp               | 1 -
 pcsx2/gui/Panels/GameFixesPanel.cpp | 4 ----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pcsx2/Config.h b/pcsx2/Config.h
index f26947ac1f..4156d73906 100644
--- a/pcsx2/Config.h
+++ b/pcsx2/Config.h
@@ -410,8 +410,7 @@ struct Pcsx2Config
 				FpuMulHack		:1,		// Tales of Destiny hangs.
 				FpuNegDivHack	:1,		// Gundam games messed up camera-view.
 				DMAExeHack		:1,		// Fatal Frame; breaks Gust and Tri-Ace games.
-				XgKickHack		:1,		// Erementar Gerad, adds more delay to VU XGkick instructions. Corrects the color of some graphics, but breaks Tri-ace games and others.
-                MpegHack		:1;		// Mana Khemia 1, breaks Digital Devil Saga.
+				XgKickHack		:1;		// Erementar Gerad, adds more delay to VU XGkick instructions. Corrects the color of some graphics, but breaks Tri-ace games and others.
 		BITFIELD_END
 
 		// all gamefixes are disabled by default.
@@ -548,7 +547,7 @@ extern SessionOverrideFlags g_Session;
 #define CHECK_VU1REC				(!g_Session.ForceDisableVU1rec && EmuConfig.Cpu.Recompiler.EnableVU1)
 
 //------------ SPECIAL GAME FIXES!!! ---------------
-#define NUM_OF_GAME_FIXES 8
+#define NUM_OF_GAME_FIXES 7
 
 #define CHECK_VUADDSUBHACK			(EmuConfig.Gamefixes.VuAddSubHack) // Special Fix for Tri-ace games, they use an encryption algorithm that requires VU addi opcode to be bit-accurate.
 #define CHECK_FPUCOMPAREHACK		(EmuConfig.Gamefixes.FpuCompareHack) // Special Fix for Digimon Rumble Arena 2, fixes spinning/hanging on intro-menu.
@@ -557,7 +556,6 @@ extern SessionOverrideFlags g_Session;
 #define CHECK_FPUNEGDIVHACK			(EmuConfig.Gamefixes.FpuNegDivHack) // Special Fix for Gundam games messed up camera-view.
 #define CHECK_DMAEXECHACK			(EmuConfig.Gamefixes.DMAExeHack)  // Special Fix for Fatal Frame; breaks Gust and Tri-Ace games.
 #define CHECK_XGKICKHACK			(EmuConfig.Gamefixes.XgKickHack) // Special Fix for Erementar Gerad, adds more delay to VU XGkick instructions. Corrects the color of some graphics.
-#define CHECK_MPEGHACK			    (EmuConfig.Gamefixes.MpegHack) // Special Fix for Mana Khemia 1; breaks Digital Devil Saga.
 
 //------------ Advanced Options!!! ---------------
 #define CHECK_VU_OVERFLOW			(EmuConfig.Cpu.Recompiler.vuOverflow)
diff --git a/pcsx2/IPU/mpeg2lib/Mpeg.cpp b/pcsx2/IPU/mpeg2lib/Mpeg.cpp
index 53dffca705..8701446e35 100644
--- a/pcsx2/IPU/mpeg2lib/Mpeg.cpp
+++ b/pcsx2/IPU/mpeg2lib/Mpeg.cpp
@@ -1260,8 +1260,9 @@ void mpeg2sliceIDEC(void* pdone)
 
 						default:	/* end of slice/frame, or error? */
 						{
-							if ((!resumed) && (CHECK_MPEGHACK)) so_resume();
-
+#ifdef MPEGHACK
+							if (!resumed) so_resume();
+#endif
 							finishmpeg2sliceIDEC(decoder);
 
 							*(int*)pdone = 1;
@@ -1288,7 +1289,9 @@ void mpeg2sliceIDEC(void* pdone)
 		}
 	}
 
-	if ((!resumed) && (CHECK_MPEGHACK)) so_resume();
+#ifdef MPEGHACK
+	if (!resumed) so_resume();
+#endif
 
 	finishmpeg2sliceIDEC(decoder);
 
diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp
index b85fcb30c0..5362d3a48a 100644
--- a/pcsx2/Pcsx2Config.cpp
+++ b/pcsx2/Pcsx2Config.cpp
@@ -220,7 +220,6 @@ void Pcsx2Config::GamefixOptions::LoadSave( IniInterface& ini )
 	IniBitBool( FpuNegDivHack );
 	IniBitBool( DMAExeHack );
 	IniBitBool( XgKickHack );
-	IniBitBool( MpegHack );
 }
 
 Pcsx2Config::Pcsx2Config() :
diff --git a/pcsx2/gui/Panels/GameFixesPanel.cpp b/pcsx2/gui/Panels/GameFixesPanel.cpp
index 87db9c4fde..11d9584ee5 100644
--- a/pcsx2/gui/Panels/GameFixesPanel.cpp
+++ b/pcsx2/gui/Panels/GameFixesPanel.cpp
@@ -63,10 +63,6 @@ Panels::GameFixesPanel::GameFixesPanel( wxWindow& parent, int idealWidth ) :
 		{
 			_("VU XGkick Hack - for Erementar Gerad."),
 			wxEmptyString
-		},
-		{
-			_("MPEG Hack - for Mana Khemia 1."),
-			wxEmptyString
 		}
 	};