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

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

3 files changed, 8 insertions, 7 deletions

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;