1
0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 03:56:10 +08:00

* 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.
This commit is contained in:
Joe Ludwig
2013-07-04 11:20:31 -07:00
parent 7502ba9583
commit 3569c0f8f5
191 changed files with 17837 additions and 41949 deletions

View File

@ -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;

View File

@ -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!!!

View File

@ -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" );
}

View File

@ -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 },

View File

@ -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 );
}