diff options
Diffstat (limited to 'mp/src/utils')
| -rw-r--r-- | mp/src/utils/glview/glview.cpp | 2 | ||||
| -rw-r--r-- | mp/src/utils/height2normal/height2normal.vpc | 2 | ||||
| -rw-r--r-- | mp/src/utils/qc_eyes/qc_eyes.vpc | 7 | ||||
| -rw-r--r-- | mp/src/utils/vbsp/boundbox.cpp | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/mp/src/utils/glview/glview.cpp b/mp/src/utils/glview/glview.cpp index d7da07b3..6d50de7f 100644 --- a/mp/src/utils/glview/glview.cpp +++ b/mp/src/utils/glview/glview.cpp @@ -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 ); diff --git a/mp/src/utils/height2normal/height2normal.vpc b/mp/src/utils/height2normal/height2normal.vpc index be330ee4..febd9d34 100644 --- a/mp/src/utils/height2normal/height2normal.vpc +++ b/mp/src/utils/height2normal/height2normal.vpc @@ -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)" } } diff --git a/mp/src/utils/qc_eyes/qc_eyes.vpc b/mp/src/utils/qc_eyes/qc_eyes.vpc index ee3b4e39..a417fd7b 100644 --- a/mp/src/utils/qc_eyes/qc_eyes.vpc +++ b/mp/src/utils/qc_eyes/qc_eyes.vpc @@ -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" diff --git a/mp/src/utils/vbsp/boundbox.cpp b/mp/src/utils/vbsp/boundbox.cpp index ecb8dfa0..a62e9e2f 100644 --- a/mp/src/utils/vbsp/boundbox.cpp +++ b/mp/src/utils/vbsp/boundbox.cpp @@ -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); } |