Merge branch 'master' of github.com:dragonblocks/dragonblocks_alpha

[dragonblocks_alpha.git] / src / util.c

diff --git a/src/util.c b/src/util.c
index 56640171f958c2cac5c934c75c4c704ae8e208fa..3836e02bfeb485456b6b275424b2a76749bb3234 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -98,14 +98,14 @@ bool my_decompress(const char *compressed, size_t compressed_size, void *decompr
        inflate(&stream, Z_NO_FLUSH);
        inflateEnd(&stream);
 
-       return stream.total_out == expected_decompressed_size;
+       return (size_t) stream.total_out == expected_decompressed_size;
 }
 
 // return true if a player is close enough to a block to access it
 bool within_simulation_distance(v3f64 player_pos, v3s32 block_pos, u32 simulation_distance)
 {
        v3s32 player_block_pos = map_node_to_block_pos((v3s32) {player_pos.x, player_pos.y, player_pos.z}, NULL);
-       return abs(player_block_pos.x - block_pos.x) <= simulation_distance && abs(player_block_pos.y - block_pos.y) <= simulation_distance && abs(player_block_pos.z - block_pos.z) <= simulation_distance;
+       return abs(player_block_pos.x - block_pos.x) <= (s32) simulation_distance && abs(player_block_pos.y - block_pos.y) <= (s32) simulation_distance && abs(player_block_pos.z - block_pos.z) <= (s32) simulation_distance;
 }
 
 f64 clamp(f64 v, f64 min, f64 max)