UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove redundant code.

Browse Source
This commit is contained in:
Nicholas Hastings 2014-06-19 23:47:50 -04:00
parent 1daf629a42
commit fe485836f1
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/tf2/holiday.cpp
View File

@ -122,12 +122,9 @@ void HolidayManager::UnhookIfNecessary()
if (m_isHolidayForward->GetFunctionCount() > 0) if (m_isHolidayForward->GetFunctionCount() > 0)
return; return;
if (m_iHookID)
{
SH_REMOVE_HOOK_ID(m_iHookID); SH_REMOVE_HOOK_ID(m_iHookID);
m_iHookID = 0; m_iHookID = 0;
} }
}
void HolidayManager::OnPluginLoaded(IPlugin *plugin) void HolidayManager::OnPluginLoaded(IPlugin *plugin)
{ {
@ -141,14 +138,8 @@ void HolidayManager::OnPluginUnloaded(IPlugin *plugin)
bool HolidayManager::Hook_IsHolidayActive(int holiday) bool HolidayManager::Hook_IsHolidayActive(int holiday)
{ {
void *pGameRules = NULL; void *pGameRules = META_IFACEPTR(void *);
if (g_pSDKTools)
{
pGameRules = g_pSDKTools->GetGameRules();
}
if (pGameRules)
{
bool actualres = SH_MCALL(pGameRules, IsHolidayActive)(holiday); bool actualres = SH_MCALL(pGameRules, IsHolidayActive)(holiday);
if (!m_isHolidayForward) if (!m_isHolidayForward)
{ {
@ -167,7 +158,6 @@ bool HolidayManager::Hook_IsHolidayActive(int holiday)
{ {
RETURN_META_VALUE(MRES_SUPERCEDE, (newres == 0) ? false : true); RETURN_META_VALUE(MRES_SUPERCEDE, (newres == 0) ? false : true);
} }
}
RETURN_META_VALUE(MRES_IGNORED, true); RETURN_META_VALUE(MRES_IGNORED, true);
} }