1
0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 12:06:07 +08:00

SDK sync.

This commit is contained in:
Nicholas Hastings
2014-02-28 14:08:09 -05:00
parent 7cc1bd2f96
commit e2781a0000
558 changed files with 39082 additions and 1463 deletions

View File

@ -64,7 +64,7 @@ BOOL g_Update = TRUE;
BOOL g_bDisp = FALSE;
IPhysicsCollision *physcollision = NULL;
// -----------
static int g_Keys[255];
static int g_Keys[256];
void AppKeyDown( int key );
void AppKeyUp( int key );

View File

@ -14,7 +14,7 @@ $Configuration
$Compiler
{
$AdditionalIncludeDirectories "$BASE,..\common"
$PreprocessorDefinitions "_HAS_ITERATOR_DEBUGGING=0;_DEBUG;_WIN32;_CONSOLE"
$PreprocessorDefinitions "_HAS_ITERATOR_DEBUGGING=0;_WIN32;_CONSOLE;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions)"
}
}

View File

@ -13,10 +13,17 @@ $Configuration
{
$Compiler
{
// Deprecated MBCS MFC libraries for VS 2013 (nafxcw.lib and nafxcwd.lib) can be downloaded from http://go.microsoft.com/?linkid=9832071
$PreprocessorDefinitions "$BASE;NO_WARN_MBCS_MFC_DEPRECATION"
$Create/UsePrecompiledHeader "Use Precompiled Header (/Yu)"
$PrecompiledHeaderFile "Debug/QC_Eyes.pch"
$EnableC++Exceptions "Yes (/EHsc)"
}
$Linker
{
$AdditionalDependencies "$BASE;windowscodecs.lib"
}
}
$Project "QC_Eyes"

View File

@ -14,7 +14,7 @@
#include "tier0/memdbgon.h"
float rint(float f)
float V_rint(float f)
{
if (f > 0.0f) {
return (float) floor(f + 0.5f);
@ -223,7 +223,7 @@ void BoundBox::GetBoundsSize(Vector& size)
//-----------------------------------------------------------------------------
static int Snap(/*int*/ float iValue, int iGridSize)
{
return (int)(rint(iValue/iGridSize) * iGridSize);
return (int)(V_rint(iValue/iGridSize) * iGridSize);
}

View File

@ -2003,7 +2003,7 @@ void CMapFile::CheckForInstances( const char *pszFileName )
char FDGPath[ MAX_PATH ];
if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, "EXECUTABLE_PATH", FDGPath, sizeof( FDGPath ) ) )
{
if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, "", FDGPath, sizeof( FDGPath ) ) )
if ( !g_pFullFileSystem->RelativePathToFullPath( GameDataFile, NULL, FDGPath, sizeof( FDGPath ) ) )
{
Msg( "Could not locate GameData file %s\n", GameDataFile );
}