From 3b2944fe452d8e23ae4834aaeb82546e920701d6 Mon Sep 17 00:00:00 2001
From: avihal <avihal@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Wed, 20 Jun 2012 20:45:24 +0000
Subject: [PATCH] GSdx: Disable CRC hacks: Yet cleaner, better and more
 generic. Thx to sudonim.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5321 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/GSdx/GSRendererHW.cpp | 2 +-
 plugins/GSdx/GSState.cpp      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/GSdx/GSRendererHW.cpp b/plugins/GSdx/GSRendererHW.cpp
index ffddb37aed..c805d5f0e5 100644
--- a/plugins/GSdx/GSRendererHW.cpp
+++ b/plugins/GSdx/GSRendererHW.cpp
@@ -254,7 +254,7 @@ void GSRendererHW::Draw()
 		s_n++;
 	}
 
-	if(!userHacks_DisableCrcHacks && m_hacks.m_oi && !(this->*m_hacks.m_oi)(rt->m_texture, ds->m_texture, tex))
+	if(m_hacks.m_oi && !(this->*m_hacks.m_oi)(rt->m_texture, ds->m_texture, tex))
 	{
 		return;
 	}
diff --git a/plugins/GSdx/GSState.cpp b/plugins/GSdx/GSState.cpp
index eac4dff1e8..01a31b08cb 100644
--- a/plugins/GSdx/GSState.cpp
+++ b/plugins/GSdx/GSState.cpp
@@ -2229,7 +2229,7 @@ void GSState::SetGameCRC(uint32 crc, int options)
 {
 	m_crc = crc;
 	m_options = options;
-	m_game = CRC::Lookup(crc);
+	m_game = CRC::Lookup(userHacks_DisableCrcHacks ? 0 : crc);
 }
 
 //
@@ -5320,7 +5320,7 @@ bool GSState::IsBadFrame(int& skip, int UserHacks_SkipDraw)
 #ifdef ENABLE_DYNAMIC_CRC_HACK
 	bool res=false; if(IsInvokedDynamicCrcHack(fi, skip, g_crc_region, res, m_crc)){ if( !res ) return false;	} else
 #endif
-	if(gsc && !userHacks_DisableCrcHacks && !gsc(fi, skip))
+	if(gsc && !gsc(fi, skip))
 	{
 		return false;
 	}