CSSZombieEscape/demboyz
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed compile errors with vs2015

Browse Source
This commit is contained in:
Jordan Cristiano
2015-07-28 21:08:38 -04:00
parent 0f471d9b7a
commit 7de51e14ba
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
external/sourcesdk/bitbuf.cpp vendored
View File

@@ -8,7 +8,7 @@
#include "sourcesdk/bitbuf.h" #include "sourcesdk/bitbuf.h"
#include <string.h> #include <string.h>
#include <math.h> #include <cmath>
#include <stdlib.h> #include <stdlib.h>
// FIXME: Can't use this until we get multithreaded allocations in tier0 working for tools // FIXME: Can't use this until we get multithreaded allocations in tier0 working for tools
@@ -568,10 +568,10 @@ void bf_write::WriteBitCoordMP( const float f, bool bIntegral, bool bLowPrecisio
VPROF( "bf_write::WriteBitCoordMP" ); VPROF( "bf_write::WriteBitCoordMP" );
#endif #endif
int signbit = (f <= -( bLowPrecision ? COORD_RESOLUTION_LOWPRECISION : COORD_RESOLUTION )); int signbit = (f <= -( bLowPrecision ? COORD_RESOLUTION_LOWPRECISION : COORD_RESOLUTION ));
int intval = (int)abs(f); int intval = (int)std::abs(f);
int fractval = bLowPrecision ? int fractval = bLowPrecision ?
( abs((int)(f*COORD_DENOMINATOR_LOWPRECISION)) & (COORD_DENOMINATOR_LOWPRECISION-1) ) : ( std::abs((int)(f*COORD_DENOMINATOR_LOWPRECISION)) & (COORD_DENOMINATOR_LOWPRECISION-1) ) :
( abs((int)(f*COORD_DENOMINATOR)) & (COORD_DENOMINATOR-1) ); ( std::abs((int)(f*COORD_DENOMINATOR)) & (COORD_DENOMINATOR-1) );
bool bInBounds = intval < (1 << COORD_INTEGER_BITS_MP ); bool bInBounds = intval < (1 << COORD_INTEGER_BITS_MP );
@@ -621,8 +621,8 @@ void bf_write::WriteBitCoord (const float f)
VPROF( "bf_write::WriteBitCoord" ); VPROF( "bf_write::WriteBitCoord" );
#endif #endif
int signbit = (f <= -COORD_RESOLUTION); int signbit = (f <= -COORD_RESOLUTION);
int intval = (int)abs(f); int intval = (int)std::abs(f);
int fractval = abs((int)(f*COORD_DENOMINATOR)) & (COORD_DENOMINATOR-1); int fractval = std::abs((int)(f*COORD_DENOMINATOR)) & (COORD_DENOMINATOR-1);
// Send the bit flags that indicate whether we have an integer part and/or a fraction part. // Send the bit flags that indicate whether we have an integer part and/or a fraction part.
@@ -675,7 +675,7 @@ void bf_write::WriteBitNormal( float f )
int signbit = (f <= -NORMAL_RESOLUTION); int signbit = (f <= -NORMAL_RESOLUTION);
// NOTE: Since +/-1 are valid values for a normal, I'm going to encode that as all ones // NOTE: Since +/-1 are valid values for a normal, I'm going to encode that as all ones
unsigned int fractval = abs( (int)(f*NORMAL_DENOMINATOR) ); unsigned int fractval = std::abs( (int)(f*NORMAL_DENOMINATOR) );
// clamp.. // clamp..
if (fractval > NORMAL_DENOMINATOR) if (fractval > NORMAL_DENOMINATOR)
@@ -1340,7 +1340,7 @@ void bf_read::ReadBitVec3Normal( Vector& fa )
float fafafbfb = fa[0] * fa[0] + fa[1] * fa[1]; float fafafbfb = fa[0] * fa[0] + fa[1] * fa[1];
if (fafafbfb < 1.0f) if (fafafbfb < 1.0f)
fa[2] = sqrt( 1.0f - fafafbfb ); fa[2] = std::sqrt( 1.0f - fafafbfb );
else else
fa[2] = 0.0f; fa[2] = 0.0f;