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

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

7 files changed, 13 insertions, 11 deletions

diff --git a/mp/src/utils/common/mstristrip.cpp b/mp/src/utils/common/mstristrip.cpp
index 6a66de2f..9e611f94 100644
--- a/mp/src/utils/common/mstristrip.cpp
+++ b/mp/src/utils/common/mstristrip.cpp
@@ -867,7 +867,7 @@ public:
     int iFirstUsed;

     int iOrigIndex;

 

-    bool operator<(const SortEntry& rhs)

+    bool operator<(const SortEntry& rhs) const

     {

         return iFirstUsed < rhs.iFirstUsed;

     }

diff --git a/mp/src/utils/vbsp/cubemap.cpp b/mp/src/utils/vbsp/cubemap.cpp
index fda41703..2415115b 100644
--- a/mp/src/utils/vbsp/cubemap.cpp
+++ b/mp/src/utils/vbsp/cubemap.cpp
@@ -286,12 +286,8 @@ void CreateDefaultCubemaps( bool bHDR )
 	// NOTE: This implementation depends on the fact that all VTF files contain

 	// all mipmap levels

 	const char *pSkyboxBaseName = FindSkyboxMaterialName();

-	char skyboxMaterialName[MAX_PATH];

-	Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );

 

-	IVTFTexture *pSrcVTFTextures[6];

-

-	if( !skyboxMaterialName )

+	if( !pSkyboxBaseName )

 	{

 		if( s_DefaultCubemapNames.Count() )

 		{

@@ -300,6 +296,11 @@ void CreateDefaultCubemaps( bool bHDR )
 		return;

 	}

 

+	char skyboxMaterialName[MAX_PATH];

+	Q_snprintf( skyboxMaterialName, MAX_PATH, "skybox/%s", pSkyboxBaseName );

+

+	IVTFTexture *pSrcVTFTextures[6];

+

 	int unionTextureFlags = 0;

 	if( !LoadSrcVTFFiles( pSrcVTFTextures, skyboxMaterialName, &unionTextureFlags, bHDR ) )

 	{

diff --git a/mp/src/utils/vbsp/detailobjects.cpp b/mp/src/utils/vbsp/detailobjects.cpp
index 22595781..b110534c 100644
--- a/mp/src/utils/vbsp/detailobjects.cpp
+++ b/mp/src/utils/vbsp/detailobjects.cpp
@@ -379,7 +379,7 @@ static int SelectDetail( DetailObjectGroup_t const& group )
 static int AddDetailDictLump( const char* pModelName )

 {

 	DetailObjectDictLump_t dictLump;

-	strncpy( dictLump.m_Name, pModelName, DETAIL_NAME_LENGTH );

+	Q_strncpy( dictLump.m_Name, pModelName, DETAIL_NAME_LENGTH );

 

 	for (int i = s_DetailObjectDictLump.Count(); --i >= 0; )

 	{

diff --git a/mp/src/utils/vbsp/ivp.cpp b/mp/src/utils/vbsp/ivp.cpp
index 421b1b2e..585f0904 100644
--- a/mp/src/utils/vbsp/ivp.cpp
+++ b/mp/src/utils/vbsp/ivp.cpp
@@ -432,7 +432,7 @@ public:
 

 private:

 

-	CPhysConvex *CPlaneList::BuildConvexForBrush( int brushnumber, float shrink, CPhysCollide *pCollideTest, float shrinkMinimum );

+	CPhysConvex *BuildConvexForBrush( int brushnumber, float shrink, CPhysCollide *pCollideTest, float shrinkMinimum );

 

 public:

 	CUtlVector<CPhysConvex *>	m_convex;

diff --git a/mp/src/utils/vrad/vrad.cpp b/mp/src/utils/vrad/vrad.cpp
index 854956ec..8100dc3f 100644
--- a/mp/src/utils/vrad/vrad.cpp
+++ b/mp/src/utils/vrad/vrad.cpp
@@ -93,7 +93,7 @@ bool g_bOnlyStaticProps = false;
 bool g_bShowStaticPropNormals = false;

 

 

-float		gamma = 0.5;

+float		gamma_value = 0.5;

 float		indirect_sun = 1.0;

 float		reflectivityScale = 1.0;

 qboolean	do_extra = true;

diff --git a/mp/src/utils/vrad/vrad.h b/mp/src/utils/vrad/vrad.h
index b9dc0a3f..b39d66c8 100644
--- a/mp/src/utils/vrad/vrad.h
+++ b/mp/src/utils/vrad/vrad.h
@@ -336,7 +336,7 @@ extern dface_t *g_pFaces;
 extern bool g_bMPIProps;

 

 extern	byte	nodehit[MAX_MAP_NODES];

-extern  float	gamma;

+extern  float	gamma_value;

 extern	float	indirect_sun;

 extern	float	smoothing_threshold;

 extern	int		dlight_map;

diff --git a/mp/src/utils/vrad/vraddetailprops.cpp b/mp/src/utils/vrad/vraddetailprops.cpp
index 6712beb1..822bc78c 100644
--- a/mp/src/utils/vrad/vraddetailprops.cpp
+++ b/mp/src/utils/vrad/vraddetailprops.cpp
@@ -524,7 +524,8 @@ private:
 	bool TestPointAgainstSkySurface( Vector const &pt, dface_t *pFace )

 	{

 		// Create sky face winding.

-		winding_t *pWinding = WindingFromFace( pFace, Vector( 0.0f, 0.0f, 0.0f ) );

+		Vector v( 0.0f, 0.0f, 0.0f );

+		winding_t *pWinding = WindingFromFace( pFace, v );

 

 		// Test point in winding. (Since it is at the node, it is in the plane.)

 		bool bRet = PointInWinding( pt, pWinding );