diff options
Diffstat (limited to 'mp/src/game/server/cbase.cpp')
| -rw-r--r-- | mp/src/game/server/cbase.cpp | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/mp/src/game/server/cbase.cpp b/mp/src/game/server/cbase.cpp index d748a1dd..d6627b4b 100644 --- a/mp/src/game/server/cbase.cpp +++ b/mp/src/game/server/cbase.cpp @@ -281,7 +281,11 @@ void CBaseEntityOutput::FireOutput(variant_t Value, CBaseEntity *pActivator, CBa Q_snprintf( szBuffer, sizeof(szBuffer), "(%0.2f) output: (%s,%s) -> (%s,%s,%.1f)(%s)\n", +#ifdef TF_DLL engine->GetServerTime(), +#else + gpGlobals->curtime, +#endif pCaller ? STRING(pCaller->m_iClassname) : "NULL", pCaller ? STRING(pCaller->GetEntityName()) : "NULL", STRING(ev->m_iTarget), @@ -298,7 +302,11 @@ void CBaseEntityOutput::FireOutput(variant_t Value, CBaseEntity *pActivator, CBa Q_snprintf( szBuffer, sizeof(szBuffer), "(%0.2f) output: (%s,%s) -> (%s,%s)(%s)\n", +#ifdef TF_DLL engine->GetServerTime(), +#else + gpGlobals->curtime, +#endif pCaller ? STRING(pCaller->m_iClassname) : "NULL", pCaller ? STRING(pCaller->GetEntityName()) : "NULL", STRING(ev->m_iTarget), STRING(ev->m_iTargetInput), @@ -459,7 +467,7 @@ void CBaseEntityOutput::DeleteAllElements( void ) m_ActionList = NULL; while (pNext) { - register CEventAction *strikeThis = pNext; + CEventAction *strikeThis = pNext; pNext = pNext->m_pNext; delete strikeThis; } @@ -767,7 +775,13 @@ void CEventQueue::Dump( void ) { EventQueuePrioritizedEvent_t *pe = m_Events.m_pNext; - Msg( "Dumping event queue. Current time is: %.2f\n", engine->GetServerTime() ); + Msg("Dumping event queue. Current time is: %.2f\n", +#ifdef TF_DLL + engine->GetServerTime() +#else + gpGlobals->curtime +#endif + ); while ( pe != NULL ) { @@ -795,7 +809,11 @@ void CEventQueue::AddEvent( const char *target, const char *targetInput, variant { // build the new event EventQueuePrioritizedEvent_t *newEvent = new EventQueuePrioritizedEvent_t; +#ifdef TF_DLL newEvent->m_flFireTime = engine->GetServerTime() + fireDelay; // priority key in the priority queue +#else + newEvent->m_flFireTime = gpGlobals->curtime + fireDelay; // priority key in the priority queue +#endif newEvent->m_iTarget = MAKE_STRING( target ); newEvent->m_pEntTarget = NULL; newEvent->m_iTargetInput = MAKE_STRING( targetInput ); @@ -814,7 +832,11 @@ void CEventQueue::AddEvent( CBaseEntity *target, const char *targetInput, varian { // build the new event EventQueuePrioritizedEvent_t *newEvent = new EventQueuePrioritizedEvent_t; +#ifdef TF_DLL newEvent->m_flFireTime = engine->GetServerTime() + fireDelay; // primary priority key in the priority queue +#else + newEvent->m_flFireTime = gpGlobals->curtime + fireDelay; // primary priority key in the priority queue +#endif newEvent->m_iTarget = NULL_STRING; newEvent->m_pEntTarget = target; newEvent->m_iTargetInput = MAKE_STRING( targetInput ); @@ -885,7 +907,11 @@ void CEventQueue::ServiceEvents( void ) EventQueuePrioritizedEvent_t *pe = m_Events.m_pNext; +#ifdef TF_DLL while ( pe != NULL && pe->m_flFireTime <= engine->GetServerTime() ) +#else + while ( pe != NULL && pe->m_flFireTime <= gpGlobals->curtime ) +#endif { MDLCACHE_CRITICAL_SECTION(); @@ -1171,7 +1197,11 @@ int CEventQueue::Restore( IRestore &restore ) AddEvent( tmpEvent.m_pEntTarget, STRING(tmpEvent.m_iTargetInput), tmpEvent.m_VariantValue, +#ifdef TF_DLL tmpEvent.m_flFireTime - engine->GetServerTime(), +#else + tmpEvent.m_flFireTime - gpGlobals->curtime, +#endif tmpEvent.m_pActivator, tmpEvent.m_pCaller, tmpEvent.m_iOutputID ); @@ -1181,7 +1211,11 @@ int CEventQueue::Restore( IRestore &restore ) AddEvent( STRING(tmpEvent.m_iTarget), STRING(tmpEvent.m_iTargetInput), tmpEvent.m_VariantValue, +#ifdef TF_DLL tmpEvent.m_flFireTime - engine->GetServerTime(), +#else + tmpEvent.m_flFireTime - gpGlobals->curtime, +#endif tmpEvent.m_pActivator, tmpEvent.m_pCaller, tmpEvent.m_iOutputID ); |