aboutsummaryrefslogtreecommitdiff
path: root/mp/src/utils
diff options
context:
space:
mode:
authorJoe Ludwig <[email protected]>2014-05-15 13:59:18 -0700
committerJoe Ludwig <[email protected]>2014-05-15 13:59:18 -0700
commit53e78c503e6e9c7d15e2eefc480755fe37dd7077 (patch)
treec8cc106eb4c0a2b2b5d79f534f2facb0514f5f55 /mp/src/utils
parentAdded many shader source files (diff)
downloadsource-sdk-2013-53e78c503e6e9c7d15e2eefc480755fe37dd7077.tar.xz
source-sdk-2013-53e78c503e6e9c7d15e2eefc480755fe37dd7077.zip
General:
* Upgraded Steamworks SDK to v1.29 * Fixed mod compatibility problem with Multiplayer Base that was introduced in September. * In Hammer, while using the Vertex Tool, pressing CTRL+B will snap selected vertices to the grid. Virtual Reality: * Mods that support virtual reality now need to have a line in gameinfo.txt that says “supportsvr 1”. This indicates to gameui and engine that certain UI should be enabled. * VR-enabled mods will now start up in VR mode when launched from Steam’s VR mode. Windows: * Upgraded to Visual Studio 2013. If you need to build projects for VS 2010, add /2010 to your VPC command line. OSX: * Upgraded to XCode 5.
Diffstat (limited to 'mp/src/utils')
-rw-r--r--mp/src/utils/captioncompiler/captioncompiler.cpp2
-rw-r--r--mp/src/utils/glview/glview.vpc1
-rw-r--r--mp/src/utils/vice/vice.cpp2
-rw-r--r--mp/src/utils/vrad/disp_vrad.cpp4
-rw-r--r--mp/src/utils/vrad/vrad.cpp7
-rw-r--r--mp/src/utils/vtf2tga/vtf2tga.cpp2
6 files changed, 9 insertions, 9 deletions
diff --git a/mp/src/utils/captioncompiler/captioncompiler.cpp b/mp/src/utils/captioncompiler/captioncompiler.cpp
index 0fee3529..e7369c18 100644
--- a/mp/src/utils/captioncompiler/captioncompiler.cpp
+++ b/mp/src/utils/captioncompiler/captioncompiler.cpp
@@ -91,7 +91,7 @@ void vprint( int depth, const char *fmt, ... )
}
}
- ::printf( string );
+ ::printf( "%s", string );
OutputDebugString( string );
if ( fp )
diff --git a/mp/src/utils/glview/glview.vpc b/mp/src/utils/glview/glview.vpc
index fa7f180c..4a519e8b 100644
--- a/mp/src/utils/glview/glview.vpc
+++ b/mp/src/utils/glview/glview.vpc
@@ -20,7 +20,6 @@ $Configuration
$Linker
{
$AdditionalDependencies "$BASE glu32.lib opengl32.lib odbc32.lib odbccp32.lib winmm.lib"
- $AdditionalDependencies "$BASE glaux.lib" [!$VS2010]
}
}
diff --git a/mp/src/utils/vice/vice.cpp b/mp/src/utils/vice/vice.cpp
index 56c6d069..1697c60d 100644
--- a/mp/src/utils/vice/vice.cpp
+++ b/mp/src/utils/vice/vice.cpp
@@ -49,7 +49,7 @@ static void Pause( void )
static void Exit(const char *msg)
{
- fprintf( stderr, msg );
+ fprintf( stderr, "%s", msg );
Pause();
exit( -1 );
}
diff --git a/mp/src/utils/vrad/disp_vrad.cpp b/mp/src/utils/vrad/disp_vrad.cpp
index b254b9d7..b1d63b6e 100644
--- a/mp/src/utils/vrad/disp_vrad.cpp
+++ b/mp/src/utils/vrad/disp_vrad.cpp
@@ -46,7 +46,7 @@ int FindNeighborCornerVert( CCoreDispInfo *pDisp, const Vector &vTest )
}
-int GetAllNeighbors( const CCoreDispInfo *pDisp, int iNeighbors[512] )
+int GetAllNeighbors( const CCoreDispInfo *pDisp, int (&iNeighbors)[512] )
{
int nNeighbors = 0;
@@ -57,7 +57,7 @@ int GetAllNeighbors( const CCoreDispInfo *pDisp, int iNeighbors[512] )
for ( int i=0; i < pCorner->m_nNeighbors; i++ )
{
- if ( nNeighbors < _ARRAYSIZE( iNeighbors ) )
+ if ( nNeighbors < ARRAYSIZE( iNeighbors ) )
iNeighbors[nNeighbors++] = pCorner->m_Neighbors[i];
}
}
diff --git a/mp/src/utils/vrad/vrad.cpp b/mp/src/utils/vrad/vrad.cpp
index 70e481fb..a7cba1c0 100644
--- a/mp/src/utils/vrad/vrad.cpp
+++ b/mp/src/utils/vrad/vrad.cpp
@@ -34,7 +34,7 @@ every surface must be divided into at least two patches each axis
*/
CUtlVector<CPatch> g_Patches;
-CUtlVector<int> g_FacePatches; // constains all patches, children first
+CUtlVector<int> g_FacePatches; // contains all patches, children first
CUtlVector<int> faceParents; // contains only root patches, use next parent to iterate
CUtlVector<int> clusterChildren;
CUtlVector<Vector> emitlight;
@@ -2408,12 +2408,13 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
{
if ( ++i < argc )
{
- numbounce = atoi (argv[i]);
- if ( numbounce < 0 )
+ int bounceParam = atoi (argv[i]);
+ if ( bounceParam < 0 )
{
Warning("Error: expected non-negative value after '-bounce'\n" );
return 1;
}
+ numbounce = (unsigned)bounceParam;
}
else
{
diff --git a/mp/src/utils/vtf2tga/vtf2tga.cpp b/mp/src/utils/vtf2tga/vtf2tga.cpp
index acdace83..c06999b0 100644
--- a/mp/src/utils/vtf2tga/vtf2tga.cpp
+++ b/mp/src/utils/vtf2tga/vtf2tga.cpp
@@ -37,7 +37,7 @@ static void PFMWrite( float *pFloatImage, const char *pFilename, int width, int
SpewRetval_t VTF2TGAOutputFunc( SpewType_t spewType, char const *pMsg )
{
- printf( pMsg );
+ printf( "%s", pMsg );
fflush( stdout );
if (spewType == SPEW_ERROR)