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

44
extensions/tf2/holiday.cpp
View File

@ -122,11 +122,8 @@ void HolidayManager::UnhookIfNecessary()
if (m_isHolidayForward->GetFunctionCount() > 0) if (m_isHolidayForward->GetFunctionCount() > 0)
return; 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) void HolidayManager::OnPluginLoaded(IPlugin *plugin)
@ -141,32 +138,25 @@ 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)
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); RETURN_META_VALUE(MRES_SUPERCEDE, (newres == 0) ? false : true);
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_IGNORED, true); RETURN_META_VALUE(MRES_IGNORED, true);