From 6830f07f27151a27f78e62e8128587e4e9398393 Mon Sep 17 00:00:00 2001
From: gabest11 <gabest11@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sun, 12 Apr 2009 19:46:42 +0000
Subject: [PATCH] GSdx: GoW2, try #3

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@962 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/GSdx/GPURenderer.h | 13 ++++---------
 plugins/GSdx/GSRenderer.h  | 39 +++++++++++---------------------------
 plugins/GSdx/GSState.cpp   |  2 +-
 3 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/plugins/GSdx/GPURenderer.h b/plugins/GSdx/GPURenderer.h
index 96ff0df01f..17df468a44 100644
--- a/plugins/GSdx/GPURenderer.h
+++ b/plugins/GSdx/GPURenderer.h
@@ -56,20 +56,15 @@ protected:
 	{
 		if(message == WM_KEYUP)
 		{
-			if(wParam == VK_DELETE)
+			switch(wParam)
 			{
+			case VK_DELETE:
 				m_filter = (m_filter + 1) % 3;
 				return 0;
-			}
-
-			if(wParam == VK_END)
-			{
+			case VK_END:
 				m_dither = m_dither ? 0 : 1;
 				return 0;
-			}
-
-			if(wParam == VK_NEXT)
-			{
+			case VK_NEXT:
 				m_aspectratio = (m_aspectratio + 1) % 3;
 				return 0;
 			}
diff --git a/plugins/GSdx/GSRenderer.h b/plugins/GSdx/GSRenderer.h
index f7a5b05df0..ad56de020f 100644
--- a/plugins/GSdx/GSRenderer.h
+++ b/plugins/GSdx/GSRenderer.h
@@ -67,36 +67,25 @@ protected:
 		{
 			int step = (::GetAsyncKeyState(VK_SHIFT) & 0x8000) ? -1 : 1;
 
-			if(msg.wParam == VK_F5)
+			switch(msg.wParam)
 			{
+			case VK_F5:
 				m_interlace = (m_interlace + 7 + step) % 7;
 				return true;
-			}
-
-			if(msg.wParam == VK_F6)
-			{
+			case VK_F6:
 				m_aspectratio = (m_aspectratio + 3 + step) % 3;
 				return true;
-			}			
-
-			if(msg.wParam == VK_F7)
-			{
+			case VK_F7:
 				m_wnd.SetWindowText(_T("PCSX2"));
 				m_osd = !m_osd;
 				return true;
-			}
-
-			if(msg.wParam == VK_DELETE)
-			{
+			case VK_DELETE:
 				m_aa1 = !m_aa1;
 				return true;
-			}			
-
-			if(msg.wParam == VK_END)
-			{
+			case VK_END:
 				m_blur = !m_blur;
 				return true;
-			}			
+			}
 		}
 
 		return false;
@@ -398,17 +387,11 @@ protected:
 	{
 		if(msg.message == WM_KEYDOWN)
 		{
-			if(msg.wParam == VK_F12)
+			switch(msg.wParam)
 			{
-				if(m_capture.IsCapturing())
-				{
-					m_capture.EndCapture();
-				}
-				else
-				{
-					m_capture.BeginCapture(GetFPS());
-				}
-
+			case VK_F12:
+				if(m_capture.IsCapturing()) m_capture.EndCapture();
+				else m_capture.BeginCapture(GetFPS());
 				return true;
 			}
 		}
diff --git a/plugins/GSdx/GSState.cpp b/plugins/GSdx/GSState.cpp
index 0664a1fff6..bf147881b0 100644
--- a/plugins/GSdx/GSState.cpp
+++ b/plugins/GSdx/GSState.cpp
@@ -2088,7 +2088,7 @@ bool GSC_GodOfWar2(const GSFrameInfo& fi, int& skip)
 		if(fi.TME && fi.FBP == 0x00100 && fi.FPSM == PSM_PSMCT16 && fi.TBP0 == 0x00100 && fi.TPSM == PSM_PSMCT16 // ntsc
 		|| fi.TME && fi.FBP == 0x02100 && fi.FPSM == PSM_PSMCT16 && fi.TBP0 == 0x02100 && fi.TPSM == PSM_PSMCT16) // pal
 		{
-			skip = 30; // shadows
+			skip = 29; // shadows
 		}
 		else if(fi.TME && fi.FBP == 0x00500 && fi.FPSM == PSM_PSMCT24 && fi.TBP0 == 0x02100 && fi.TPSM == PSM_PSMCT32) // pal
 		{