Merge remote-tracking branch 'upstream/master' into vbsp-fixes.

1 files changed, 30 insertions, 30 deletions

diff --git a/mp/src/game/client/interpolatedvar.cpp b/mp/src/game/client/interpolatedvar.cpp
index 582ef915..44caf808 100644
--- a/mp/src/game/client/interpolatedvar.cpp
+++ b/mp/src/game/client/interpolatedvar.cpp
@@ -1,30 +1,30 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//

-//

-// Purpose: 

-//

-//=============================================================================//

-

-#include "cbase.h"

-#include "interpolatedvar.h"

-

-// memdbgon must be the last include file in a .cpp file!!!

-#include "tier0/memdbgon.h"

-

-// warning C4660: template-class specialization 'CInterpolatedVar<float>' is already instantiated

-#pragma warning( disable : 4660 )

-

-template class CInterpolatedVar<float>;

-template class CInterpolatedVar<Vector>;

-template class CInterpolatedVar<QAngle>;

-template class CInterpolatedVar<C_AnimationLayer>;

-

-

-CInterpolationContext *CInterpolationContext::s_pHead = NULL;

-bool CInterpolationContext::s_bAllowExtrapolation = false;

-float CInterpolationContext::s_flLastTimeStamp = 0;

-

-float g_flLastPacketTimestamp = 0;

-

-

-ConVar cl_extrapolate_amount( "cl_extrapolate_amount", "0.25", FCVAR_CHEAT, "Set how many seconds the client will extrapolate entities for." );

-

+//========= Copyright Valve Corporation, All rights reserved. ============//
+//
+// Purpose: 
+//
+//=============================================================================//
+
+#include "cbase.h"
+#include "interpolatedvar.h"
+
+// memdbgon must be the last include file in a .cpp file!!!
+#include "tier0/memdbgon.h"
+
+// warning C4660: template-class specialization 'CInterpolatedVar<float>' is already instantiated
+#pragma warning( disable : 4660 )
+
+template class CInterpolatedVar<float>;
+template class CInterpolatedVar<Vector>;
+template class CInterpolatedVar<QAngle>;
+template class CInterpolatedVar<C_AnimationLayer>;
+
+
+CInterpolationContext *CInterpolationContext::s_pHead = NULL;
+bool CInterpolationContext::s_bAllowExtrapolation = false;
+float CInterpolationContext::s_flLastTimeStamp = 0;
+
+float g_flLastPacketTimestamp = 0;
+
+
+ConVar cl_extrapolate_amount( "cl_extrapolate_amount", "0.25", FCVAR_CHEAT, "Set how many seconds the client will extrapolate entities for." );
+