From a9465b1fa17b5de97c704661a8b15f46e0e088a5 Mon Sep 17 00:00:00 2001
From: Asher Baker <asherkin@limetech.io>
Date: Wed, 4 Nov 2015 17:14:22 +0000
Subject: [PATCH] Remove -Wno-switch and fix up SDKHooks / SDKTools to compile.

---
 AMBuildScript                     | 2 --
 extensions/sdkhooks/extension.cpp | 3 +++
 extensions/sdkhooks/natives.cpp   | 2 ++
 extensions/sdktools/vcaller.cpp   | 3 +++
 extensions/sdktools/vdecoder.cpp  | 4 ++--
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/AMBuildScript b/AMBuildScript
index c10b8d8f2..48776f3b7 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -201,8 +201,6 @@ class SMConfig(object):
       '-Wall',
       '-Werror',
       '-Wno-unused',
-      '-Wno-switch',
-      '-Wno-array-bounds',
       '-msse',
       '-m32',
       '-fvisibility=hidden',
diff --git a/extensions/sdkhooks/extension.cpp b/extensions/sdkhooks/extension.cpp
index c3fbf456d..4804a4581 100644
--- a/extensions/sdkhooks/extension.cpp
+++ b/extensions/sdkhooks/extension.cpp
@@ -724,6 +724,9 @@ HookReturn SDKHooks::Hook(int entity, SDKHookType type, IPluginFunction *callbac
 			case SDKHook_CanBeAutobalanced:
 				hookid = SH_ADD_MANUALVPHOOK(CanBeAutobalanced, pEnt, SH_MEMBER(&g_Interface, &SDKHooks::Hook_CanBeAutobalanced), false);
 				break;
+			case SDKHook_MAXHOOKS:
+				// This is checked up above.
+				break;
 		}
 
 		vhook.SetHookID(hookid);
diff --git a/extensions/sdkhooks/natives.cpp b/extensions/sdkhooks/natives.cpp
index b3a70d358..e6b415431 100644
--- a/extensions/sdkhooks/natives.cpp
+++ b/extensions/sdkhooks/natives.cpp
@@ -47,6 +47,8 @@ cell_t Native_Hook(IPluginContext *pContext, const cell_t *params)
 	HookReturn ret = g_Interface.Hook(entity, type, callback);
 	switch (ret)
 	{
+		case HookRet_Successful:
+			break;
 		case HookRet_InvalidEntity:
 			pContext->ThrowNativeError("Entity %d is invalid", entity);
 			break;
diff --git a/extensions/sdktools/vcaller.cpp b/extensions/sdktools/vcaller.cpp
index 45d8e4bd4..fdc1d33c8 100644
--- a/extensions/sdktools/vcaller.cpp
+++ b/extensions/sdktools/vcaller.cpp
@@ -364,6 +364,9 @@ static cell_t SDKCall(IPluginContext *pContext, const cell_t *params)
 				startparam++;
 			}
 			break;
+		case ValveCall_Static:
+			// This should never happen as we require a thisptr to get here.
+			return pContext->ThrowNativeError("Internal consistency error: static call with thisptr");
 		}
 	}
 
diff --git a/extensions/sdktools/vdecoder.cpp b/extensions/sdktools/vdecoder.cpp
index 8bac65558..224674e0a 100644
--- a/extensions/sdktools/vdecoder.cpp
+++ b/extensions/sdktools/vdecoder.cpp
@@ -273,9 +273,9 @@ DataStatus EncodeValveParam(IPluginContext *pContext,
 
 			return Data_Okay;
 		}
+	default:
+		return Data_Fail;
 	}
-
-	return Data_Fail;
 }
 
 DataStatus DecodeValveParam(IPluginContext *pContext,