diff options
| author | Narendra Umate <[email protected]> | 2013-09-07 15:43:32 -0700 |
|---|---|---|
| committer | Narendra Umate <[email protected]> | 2013-09-07 15:43:32 -0700 |
| commit | c3ca7291626b60a32008774dd290671708babc20 (patch) | |
| tree | c87d1097bb8b59b6724ca19560f7c92b0309caf3 /mp/src/utils/vbsp | |
| parent | Update .gitignore. (diff) | |
| parent | Added missing libs for linux and OSX in their new location. (diff) | |
| download | source-sdk-2013-c3ca7291626b60a32008774dd290671708babc20.tar.xz source-sdk-2013-c3ca7291626b60a32008774dd290671708babc20.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mp/src/utils/vbsp')
| -rw-r--r-- | mp/src/utils/vbsp/cubemap.cpp | 11 | ||||
| -rw-r--r-- | mp/src/utils/vbsp/detailobjects.cpp | 2 | ||||
| -rw-r--r-- | mp/src/utils/vbsp/ivp.cpp | 2 | ||||
| -rw-r--r-- | mp/src/utils/vbsp/vbsp.vpc | 12 |
4 files changed, 14 insertions, 13 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;
diff --git a/mp/src/utils/vbsp/vbsp.vpc b/mp/src/utils/vbsp/vbsp.vpc index 10fc9db1..4c6d1862 100644 --- a/mp/src/utils/vbsp/vbsp.vpc +++ b/mp/src/utils/vbsp/vbsp.vpc @@ -7,7 +7,7 @@ $Macro SRCDIR "..\.."
$Macro OUTBINDIR "$SRCDIR\..\game\bin"
-$Include "$SRCDIR\vpc_scripts\source_exe_con_win32_base.vpc"
+$Include "$SRCDIR\vpc_scripts\source_exe_con_base.vpc"
$Configuration
{
@@ -173,11 +173,11 @@ $Project "Vbsp" $Folder "Link Libraries"
{
- $DynamicFile "$SRCDIR\lib\public\bitmap.lib"
- $DynamicFile "$SRCDIR\lib\public\fgdlib.lib"
- $DynamicFile "$SRCDIR\lib\public\mathlib.lib"
- $DynamicFile "$SRCDIR\lib\public\tier2.lib"
- $DynamicFile "$SRCDIR\lib\public\vtf.lib"
+ $Lib bitmap
+ $Lib fgdlib
+ $Lib mathlib
+ $Lib tier2
+ $Lib vtf
}
$File "notes.txt"
|