core/TimerSys.cpp
changeset 1541 e46ad208b9b4
parent 1480 30701001f41a
child 1662 a5a5bf128cd7
     1.1 --- a/core/TimerSys.cpp	Sat Oct 13 22:13:43 2007 +0000
     1.2 +++ b/core/TimerSys.cpp	Sun Oct 14 00:04:21 2007 +0000
     1.3 @@ -35,7 +35,15 @@
     1.4  #include "sourcemm_api.h"
     1.5  #include "frame_hooks.h"
     1.6  
     1.7 -SH_DECL_HOOK2_void(ICvar, CallGlobalChangeCallback, SH_NOATTRIB, false, ConVar *, const char *);
     1.8 +#if !defined ORANGEBOX_BUILD
     1.9 +#define CallGlobalChangeCallbacks	CallGlobalChangeCallback
    1.10 +#endif
    1.11 +
    1.12 +#if defined ORANGEBOX_BUILD
    1.13 +SH_DECL_HOOK3_void(ICvar, CallGlobalChangeCallbacks, SH_NOATTRIB, false, ConVar *, const char *, float);
    1.14 +#else
    1.15 +SH_DECL_HOOK2_void(ICvar, CallGlobalChangeCallbacks, SH_NOATTRIB, false, ConVar *, const char *);
    1.16 +#endif
    1.17  
    1.18  TimerSystem g_Timers;
    1.19  float g_fUniversalTime = 0.0f;
    1.20 @@ -107,7 +115,11 @@
    1.21  		mp_timelimit->SetValue(mp_timelimit->GetInt() + extra_time);
    1.22  	}
    1.23  
    1.24 +#if defined ORANGEBOX_BUILD
    1.25 +	void GlobalChangeCallback(ConVar *pVar, const char *old_value, float flOldValue)
    1.26 +#else
    1.27  	void GlobalChangeCallback(ConVar *pVar, const char *old_value)
    1.28 +#endif
    1.29  	{
    1.30  		if (pVar != mp_timelimit)
    1.31  		{
    1.32 @@ -125,12 +137,12 @@
    1.33  private:
    1.34  	void Enable()
    1.35  	{
    1.36 -		SH_ADD_HOOK_MEMFUNC(ICvar, CallGlobalChangeCallback, icvar, this, &DefaultMapTimer::GlobalChangeCallback, false);
    1.37 +		SH_ADD_HOOK_MEMFUNC(ICvar, CallGlobalChangeCallbacks, icvar, this, &DefaultMapTimer::GlobalChangeCallback, false);
    1.38  	}
    1.39  
    1.40  	void Disable()
    1.41  	{
    1.42 -		SH_REMOVE_HOOK_MEMFUNC(ICvar, CallGlobalChangeCallback, icvar, this, &DefaultMapTimer::GlobalChangeCallback, false);
    1.43 +		SH_REMOVE_HOOK_MEMFUNC(ICvar, CallGlobalChangeCallbacks, icvar, this, &DefaultMapTimer::GlobalChangeCallback, false);
    1.44  	}
    1.45  
    1.46  private: