diff options
author | SmallJoker <mk939@ymail.com> | 2015-04-29 19:28:25 +0200 |
---|---|---|
committer | est31 <MTest31@outlook.com> | 2015-05-01 07:34:51 +0200 |
commit | 6626a3f72f66703a161abccab90cffcec31c3932 (patch) | |
tree | 80838a69a411c1bff1462b7ed07be007236a4e5b /src/util | |
parent | 37ca3212eee6d70a54493168014f9254cc6e8f37 (diff) | |
download | minetest-6626a3f72f66703a161abccab90cffcec31c3932.tar.gz minetest-6626a3f72f66703a161abccab90cffcec31c3932.tar.bz2 minetest-6626a3f72f66703a161abccab90cffcec31c3932.zip |
Fix several MSVC issues numeric.h
-> Round negative numbers correctly CMakeLists.txt
-> Link Json with the static run-time library
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/numeric.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util/numeric.h b/src/util/numeric.h index b4b841918..0eba01359 100644 --- a/src/util/numeric.h +++ b/src/util/numeric.h @@ -288,7 +288,7 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir, */ inline s32 myround(f32 f) { - return floor(f + 0.5); + return (s32)(f < 0.f ? (f - 0.5f) : (f + 0.5f)); } /* |