From fe485836f11546bdeb66b6c90a49369cbd5def6c Mon Sep 17 00:00:00 2001
From: Nicholas Hastings <nshastings@gmail.com>
Date: Thu, 19 Jun 2014 23:47:50 -0400
Subject: [PATCH] Remove redundant code.

---
 extensions/tf2/holiday.cpp | 44 +++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/extensions/tf2/holiday.cpp b/extensions/tf2/holiday.cpp
index 278e02d0..1cabdd1f 100644
--- a/extensions/tf2/holiday.cpp
+++ b/extensions/tf2/holiday.cpp
@@ -122,11 +122,8 @@ void HolidayManager::UnhookIfNecessary()
 	if (m_isHolidayForward->GetFunctionCount() > 0)
 		return;
 
-	if (m_iHookID)
-	{
-		SH_REMOVE_HOOK_ID(m_iHookID);
-		m_iHookID = 0;
-	}
+	SH_REMOVE_HOOK_ID(m_iHookID);
+	m_iHookID = 0;
 }
 
 void HolidayManager::OnPluginLoaded(IPlugin *plugin)
@@ -141,32 +138,25 @@ void HolidayManager::OnPluginUnloaded(IPlugin *plugin)
 
 bool HolidayManager::Hook_IsHolidayActive(int holiday)
 {
-	void *pGameRules = NULL;
-	if (g_pSDKTools)
+	void *pGameRules = META_IFACEPTR(void *);
+
+	bool actualres = SH_MCALL(pGameRules, IsHolidayActive)(holiday);
+	if (!m_isHolidayForward)
 	{
-		pGameRules = g_pSDKTools->GetGameRules();
+		g_pSM->LogMessage(myself, "Invalid Forward");
+		RETURN_META_VALUE(MRES_IGNORED, true);
 	}
 
-	if (pGameRules)
+	cell_t result = 0;
+	cell_t newres = actualres ? 1 : 0;
+
+	m_isHolidayForward->PushCell(holiday);
+	m_isHolidayForward->PushCellByRef(&newres);
+	m_isHolidayForward->Execute(&result);
+
+	if (result > Pl_Continue)
 	{
-		bool actualres = SH_MCALL(pGameRules, IsHolidayActive)(holiday);
-		if (!m_isHolidayForward)
-		{
-			g_pSM->LogMessage(myself, "Invalid Forward");
-			RETURN_META_VALUE(MRES_IGNORED, true);
-		}
-
-		cell_t result = 0;
-		cell_t newres = actualres ? 1 : 0;
-
-		m_isHolidayForward->PushCell(holiday);
-		m_isHolidayForward->PushCellByRef(&newres);
-		m_isHolidayForward->Execute(&result);
-
-		if (result > Pl_Continue)
-		{
-			RETURN_META_VALUE(MRES_SUPERCEDE, (newres == 0) ? false : true);
-		}
+		RETURN_META_VALUE(MRES_SUPERCEDE, (newres == 0) ? false : true);
 	}
 
 	RETURN_META_VALUE(MRES_IGNORED, true);