From 581a2b83c8ad1dbdd049eab13040588e30efcc78 Mon Sep 17 00:00:00 2001
From: "gregory.hainaut@gmail.com"
 <gregory.hainaut@gmail.com@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Wed, 18 Aug 2010 16:55:45 +0000
Subject: [PATCH] GregMiscellaneous: * Use memset instead of GSC_Null, It saves
 a function call and I do not thinks it was related to the previous crash.
 Arcum can you test it ? * Tune the GOW value.

git-svn-id: http://pcsx2.googlecode.com/svn/branches/GregMiscellaneous@3666 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/zzogl-pg/opengl/GSmain.cpp         | 12 ++++++------
 plugins/zzogl-pg/opengl/ZZoglFlushHack.cpp |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/zzogl-pg/opengl/GSmain.cpp b/plugins/zzogl-pg/opengl/GSmain.cpp
index 21be06efa4..bb3095e29f 100644
--- a/plugins/zzogl-pg/opengl/GSmain.cpp
+++ b/plugins/zzogl-pg/opengl/GSmain.cpp
@@ -50,7 +50,7 @@ GSconf conf;
 int ppf, g_GSMultiThreaded, CurrentSavestate = 0;
 int g_LastCRC = 0, g_TransferredToGPU = 0, s_frameskipping = 0;
 int g_SkipFlushFrame = 0;
-GetSkipCount GetSkipCount_Handler = GSC_Null;
+GetSkipCount GetSkipCount_Handler = 0;
 
 int UPDATE_FRAMES = 16, g_nFrame = 0, g_nRealFrame = 0;
 float fFPS = 0;
@@ -186,11 +186,11 @@ void CALLBACK GSsetGameCRC(int crc, int options)
 	{
 		inited = true;
 
-		//memset(&GSC_list, 0, sizeof(GSC_list));
-		for(int i = 0; i < NUMBER_OF_TITLES; i++)
-		{
-			GSC_list[i] = GSC_Null;
-		}
+		memset(GSC_list, 0, sizeof(GSC_list));
+		// for(int i = 0; i < NUMBER_OF_TITLES; i++)
+		// {
+		// 	GSC_list[i] = GSC_Null;
+		// }
 		
 		GSC_list[Okami] = GSC_Okami;
 		GSC_list[MetalGearSolid3] = GSC_MetalGearSolid3;
diff --git a/plugins/zzogl-pg/opengl/ZZoglFlushHack.cpp b/plugins/zzogl-pg/opengl/ZZoglFlushHack.cpp
index f4bcefa1ba..ae210e3dea 100644
--- a/plugins/zzogl-pg/opengl/ZZoglFlushHack.cpp
+++ b/plugins/zzogl-pg/opengl/ZZoglFlushHack.cpp
@@ -29,7 +29,7 @@
 bool GSC_Null(const GSFrameInfo& fi, int& skip)
 {
 	//ZZLog::Error_Log("GSC_Null");
-	return false;
+	return true;
 }
 
 bool GSC_Okami(const GSFrameInfo& fi, int& skip)
@@ -437,7 +437,8 @@ bool GSC_GodOfWar(const GSFrameInfo& fi, int& skip)
 	{
 		if(fi.TME && fi.FBP == 0x00000 && fi.FPSM == PSMCT16 && fi.TBP0 == 0x00000 && fi.TPSM == PSMCT16)
 		{
-			skip = 30;
+			// skip = 30; //GSdx
+			skip = 23; // 23 or 4 need more testing
 		}
 		else if(fi.TME && fi.FBP == 0x00000 && fi.FPSM == PSMCT32 && fi.TBP0 == 0x00000 && fi.TPSM == PSMCT32 && fi.FBMSK == 0xff000000)
 		{