diff options
| author | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
|---|---|---|
| committer | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
| commit | 4fa56874ba1557274c10077bf8386ece4c61dbd6 (patch) | |
| tree | e2d336604e960b548e996d2e7dcfc5a1e1401b9e /mp/src/utils/vbsp/boundbox.cpp | |
| parent | Added DS_Store to .gitignore. (diff) | |
| parent | Make libSDL2.so/dylib into symlinks. (diff) | |
| download | source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.tar.xz source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.zip | |
Merge remote-tracking branch 'upstream/master'
Reverted .gitattributes xcode_ccache_wrapper change. Fixed line endings
for .gitignore and .gitattributes.
Diffstat (limited to 'mp/src/utils/vbsp/boundbox.cpp')
| -rw-r--r-- | mp/src/utils/vbsp/boundbox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |