aboutsummaryrefslogtreecommitdiff
path: root/sp/src/public/tier1
diff options
context:
space:
mode:
authorJoe Ludwig <[email protected]>2013-07-17 18:26:59 -0700
committerJoe Ludwig <[email protected]>2013-07-17 18:26:59 -0700
commite16ea21dc8a710237ade8413207f58d403c616a3 (patch)
tree85dcfbda9881e4e022dedafefbc2727e2fd2aa59 /sp/src/public/tier1
parentMerge pull request #36 from AnAkIn1/fogplayerparams_fix (diff)
downloadsource-sdk-2013-e16ea21dc8a710237ade8413207f58d403c616a3.tar.xz
source-sdk-2013-e16ea21dc8a710237ade8413207f58d403c616a3.zip
* Added support for building shaders in your mod
* Added nav mesh support * fixed many warnings and misc bugs * Fixed the create*projects scripts in mp * Added a bunch of stuff to .gitignore
Diffstat (limited to 'sp/src/public/tier1')
-rw-r--r--sp/src/public/tier1/checksum_crc.h2
-rw-r--r--sp/src/public/tier1/ilocalize.h4
-rw-r--r--sp/src/public/tier1/lzmaDecoder.h1
-rw-r--r--sp/src/public/tier1/strtools.h2
-rw-r--r--sp/src/public/tier1/utlrbtree.h2
5 files changed, 5 insertions, 6 deletions
diff --git a/sp/src/public/tier1/checksum_crc.h b/sp/src/public/tier1/checksum_crc.h
index a8ef71e5..130577ee 100644
--- a/sp/src/public/tier1/checksum_crc.h
+++ b/sp/src/public/tier1/checksum_crc.h
@@ -10,7 +10,7 @@
#pragma once
#endif
-typedef unsigned long CRC32_t;
+typedef unsigned int CRC32_t;
void CRC32_Init( CRC32_t *pulCRC );
void CRC32_ProcessBuffer( CRC32_t *pulCRC, const void *p, int len );
diff --git a/sp/src/public/tier1/ilocalize.h b/sp/src/public/tier1/ilocalize.h
index 348986ad..a3dd6bb8 100644
--- a/sp/src/public/tier1/ilocalize.h
+++ b/sp/src/public/tier1/ilocalize.h
@@ -135,7 +135,7 @@ private:
typedef char locchar_t;
#define loc_snprintf Q_snprintf
- #define loc_sprintf_safe V_snprintf_safe
+ #define loc_sprintf_safe V_sprintf_safe
#define loc_sncat Q_strncat
#define loc_scat_safe V_strcat_safe
#define loc_sncpy Q_strncpy
@@ -148,7 +148,7 @@ private:
typedef wchar_t locchar_t;
#define loc_snprintf V_snwprintf
- #define loc_sprintf_safe V_snwprintf_safe
+ #define loc_sprintf_safe V_swprintf_safe
#define loc_sncat V_wcsncat
#define loc_scat_safe V_wcscat_safe
#define loc_sncpy Q_wcsncpy
diff --git a/sp/src/public/tier1/lzmaDecoder.h b/sp/src/public/tier1/lzmaDecoder.h
index eb501c10..8aa1f2ca 100644
--- a/sp/src/public/tier1/lzmaDecoder.h
+++ b/sp/src/public/tier1/lzmaDecoder.h
@@ -1,4 +1,3 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//
//
// LZMA Decoder. Designed for run time decoding.
//
diff --git a/sp/src/public/tier1/strtools.h b/sp/src/public/tier1/strtools.h
index 8e38436f..6089a8f4 100644
--- a/sp/src/public/tier1/strtools.h
+++ b/sp/src/public/tier1/strtools.h
@@ -290,7 +290,7 @@ template <size_t maxLenInCharacters> int V_vsprintf_safe( OUT_Z_ARRAY char (&pDe
int V_snprintf( OUT_Z_CAP(maxLenInChars) char *pDest, int maxLenInChars, PRINTF_FORMAT_STRING const char *pFormat, ... ) FMTFUNCTION( 3, 4 );
// gcc insists on only having format annotations on declarations, not definitions, which is why I have both.
template <size_t maxLenInChars> int V_sprintf_safe( OUT_Z_ARRAY char (&pDest)[maxLenInChars], PRINTF_FORMAT_STRING const char *pFormat, ... ) FMTFUNCTION( 2, 3 );
-template <size_t maxLenInChars> int V_sprintf_safe( OUT_Z_ARRAY char (&pDest)[maxLenInChars], const char *pFormat, ... )
+template <size_t maxLenInChars> int V_sprintf_safe( OUT_Z_ARRAY char (&pDest)[maxLenInChars], PRINTF_FORMAT_STRING const char *pFormat, ... )
{
va_list params;
va_start( params, pFormat );
diff --git a/sp/src/public/tier1/utlrbtree.h b/sp/src/public/tier1/utlrbtree.h
index b2665194..6ea22614 100644
--- a/sp/src/public/tier1/utlrbtree.h
+++ b/sp/src/public/tier1/utlrbtree.h
@@ -1350,7 +1350,7 @@ int CUtlRBTree<T, I, L, M>::Depth( I node ) const
int depthright = Depth( RightChild(node) );
int depthleft = Depth( LeftChild(node) );
- return max(depthright, depthleft) + 1;
+ return Max(depthright, depthleft) + 1;
}