diff options
| author | Joe Ludwig <[email protected]> | 2013-07-04 11:20:31 -0700 |
|---|---|---|
| committer | Joe Ludwig <[email protected]> | 2013-07-04 11:20:31 -0700 |
| commit | 77b376f8a0d8d172c51729762f80bb394534aa41 (patch) | |
| tree | 79897a015745704f7202eaa6648c18f2e5312df4 /mp/src/public | |
| parent | Adding a CONTRIBUTING file so the rights that GitHub users grant to Valve wit... (diff) | |
| download | source-sdk-2013-77b376f8a0d8d172c51729762f80bb394534aa41.tar.xz source-sdk-2013-77b376f8a0d8d172c51729762f80bb394534aa41.zip | |
* Switched the SDK from checked-in projects to VPC, the Valve Project Creator. See the Getting Started document on the wiki for details.
* Pulled in bug fixes from HL2 and HL2MP.
Diffstat (limited to 'mp/src/public')
| -rw-r--r-- | mp/src/public/UtlCachedFileData.h | 4 | ||||
| -rw-r--r-- | mp/src/public/dt_common.h | 2 | ||||
| -rw-r--r-- | mp/src/public/filesystem_init.cpp | 14 | ||||
| -rw-r--r-- | mp/src/public/sentence.cpp | 2 | ||||
| -rw-r--r-- | mp/src/public/tier0/memoverride.cpp | 13 |
5 files changed, 16 insertions, 19 deletions
diff --git a/mp/src/public/UtlCachedFileData.h b/mp/src/public/UtlCachedFileData.h index b1ced0a5..7fce91f1 100644 --- a/mp/src/public/UtlCachedFileData.h +++ b/mp/src/public/UtlCachedFileData.h @@ -936,8 +936,6 @@ void CUtlCachedFileData<T>::CheckDiskInfo( bool forcerebuild, long cacheFileTime if ( !list.Count() )
return;
- bool bSteam = g_pFullFileSystem->IsSteam();
-
for ( int listStart = 0, listEnd = 0; listStart < list.Count(); listStart = listEnd+1 )
{
int pathIndex = g_pFullFileSystem->GetPathIndex( m_Elements[list[listStart].index].handle );
@@ -957,7 +955,7 @@ void CUtlCachedFileData<T>::CheckDiskInfo( bool forcerebuild, long cacheFileTime {
bCheck = false;
}
- else if ( !bSteam )
+ else
{
long pathTime = g_pFullFileSystem->GetPathTime( fn, "GAME" );
bCheck = (pathTime > cacheFileTime) ? true : false;
diff --git a/mp/src/public/dt_common.h b/mp/src/public/dt_common.h index a2d6bdca..d899ee80 100644 --- a/mp/src/public/dt_common.h +++ b/mp/src/public/dt_common.h @@ -190,7 +190,7 @@ public: union
{
float m_Float;
- long m_Int;
+ int m_Int;
const char *m_pString;
void *m_pData; // For DataTables.
#if 0 // We can't ship this since it changes the size of DTVariant to be 20 bytes instead of 16 and that breaks MODs!!!
diff --git a/mp/src/public/filesystem_init.cpp b/mp/src/public/filesystem_init.cpp index 5ca97fb3..2f8366e4 100644 --- a/mp/src/public/filesystem_init.cpp +++ b/mp/src/public/filesystem_init.cpp @@ -1407,17 +1407,9 @@ void FileSystem_ClearSteamEnvVars() void FileSystem_AddSearchPath_Platform( IFileSystem *pFileSystem, const char *szGameInfoPath )
{
char platform[MAX_PATH];
- if ( pFileSystem->IsSteam() )
- {
- // Steam doesn't support relative paths
- Q_strncpy( platform, "platform", MAX_PATH );
- }
- else
- {
- Q_strncpy( platform, szGameInfoPath, MAX_PATH );
- Q_StripTrailingSlash( platform );
- Q_strncat( platform, "/../platform", MAX_PATH, MAX_PATH );
- }
+ Q_strncpy( platform, szGameInfoPath, MAX_PATH );
+ Q_StripTrailingSlash( platform );
+ Q_strncat( platform, "/../platform", MAX_PATH, MAX_PATH );
pFileSystem->AddSearchPath( platform, "PLATFORM" );
}
diff --git a/mp/src/public/sentence.cpp b/mp/src/public/sentence.cpp index be55b5de..2f833952 100644 --- a/mp/src/public/sentence.cpp +++ b/mp/src/public/sentence.cpp @@ -360,7 +360,7 @@ static CCLanguage g_CCLanguageLookup[] = { CC_FRENCH, "french", 150, 0, 0 },
{ CC_GERMAN, "german", 0, 150, 0 },
{ CC_ITALIAN, "italian", 0, 150, 150 },
- { CC_KOREAN, "korean", 150, 0, 150 },
+ { CC_KOREAN, "koreana", 150, 0, 150 },
{ CC_SCHINESE, "schinese", 150, 0, 150 },
{ CC_SPANISH, "spanish", 0, 0, 150 },
{ CC_TCHINESE, "tchinese", 150, 0, 150 },
diff --git a/mp/src/public/tier0/memoverride.cpp b/mp/src/public/tier0/memoverride.cpp index 84c8dcf3..29495903 100644 --- a/mp/src/public/tier0/memoverride.cpp +++ b/mp/src/public/tier0/memoverride.cpp @@ -737,9 +737,16 @@ int __cdecl _CrtDbgReport( int nRptType, const char * szFile, {
static char output[1024];
va_list args;
- va_start( args, szFormat );
- _vsnprintf( output, sizeof( output )-1, szFormat, args );
- va_end( args );
+ if ( szFormat )
+ {
+ va_start( args, szFormat );
+ _vsnprintf( output, sizeof( output )-1, szFormat, args );
+ va_end( args );
+ }
+ else
+ {
+ output[0] = 0;
+ }
return g_pMemAlloc->CrtDbgReport( nRptType, szFile, nLine, szModule, output );
}
|