* Fixed Source Mod back-compatability by reordering methods in a couple interfaces.

* Added missing singleplayer OSX libs
* Updated vpc and libs.

2 files changed, 5 insertions, 4 deletions

diff --git a/mp/src/public/engine/IStaticPropMgr.h b/mp/src/public/engine/IStaticPropMgr.h
index ca06f8ff..b331fdb2 100644
--- a/mp/src/public/engine/IStaticPropMgr.h
+++ b/mp/src/public/engine/IStaticPropMgr.h
@@ -63,8 +63,6 @@ public:
 	// Adds decals to static props, returns point of decal in trace_t

 	virtual void	AddDecalToStaticProp( const Vector& rayStart, const Vector& rayEnd,

 		int staticPropIndex, int decalIndex, bool doTrace, trace_t& tr ) = 0;

-	virtual void AddColorDecalToStaticProp( Vector const& rayStart, Vector const& rayEnd,

-		int staticPropIndex, int decalIndex, bool doTrace, trace_t& tr, bool bUseColor, Color cColor ) = 0;

 	// Adds/removes shadows from static props

 	virtual void	AddShadowToStaticProp( unsigned short shadowHandle, IClientRenderable* pRenderable ) = 0;

 	virtual void	RemoveAllShadowsFromStaticProp( IClientRenderable* pRenderable ) = 0;

@@ -81,6 +79,8 @@ public:
 	//===================================================================

 

 	virtual void DrawStaticProps( IClientRenderable **pProps, int count, bool bShadowDepth, bool drawVCollideWireframe ) = 0;

+	virtual void AddColorDecalToStaticProp( Vector const& rayStart, Vector const& rayEnd,

+		int staticPropIndex, int decalIndex, bool doTrace, trace_t& tr, bool bUseColor, Color cColor ) = 0;

 };

 

 class IStaticPropMgrServer : public IStaticPropMgr

diff --git a/mp/src/public/engine/ivmodelrender.h b/mp/src/public/engine/ivmodelrender.h
index 5b60d893..56aea6c2 100644
--- a/mp/src/public/engine/ivmodelrender.h
+++ b/mp/src/public/engine/ivmodelrender.h
@@ -138,8 +138,6 @@ public:
 	// radius of the decal to create.

 	virtual void AddDecal( ModelInstanceHandle_t handle, Ray_t const& ray, 

 		Vector const& decalUp, int decalIndex, int body, bool noPokeThru = false, int maxLODToDecal = ADDDECAL_TO_ALL_LODS ) = 0;

-	virtual void AddColoredDecal( ModelInstanceHandle_t handle, Ray_t const& ray, 

-		Vector const& decalUp, int decalIndex, int body, Color cColor, bool noPokeThru = false, int maxLODToDecal = ADDDECAL_TO_ALL_LODS ) = 0;

 

 	// Removes all the decals on a model instance

 	virtual void RemoveAllDecals( ModelInstanceHandle_t handle ) = 0;

@@ -176,6 +174,9 @@ public:
 	virtual void SuppressEngineLighting( bool bSuppress ) = 0;

 

 	virtual void SetupColorMeshes( int nTotalVerts ) = 0;

+

+	virtual void AddColoredDecal( ModelInstanceHandle_t handle, Ray_t const& ray, 

+		Vector const& decalUp, int decalIndex, int body, Color cColor, bool noPokeThru = false, int maxLODToDecal = ADDDECAL_TO_ALL_LODS ) = 0;

 };