diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2016-11-13 20:00:01 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2016-11-13 20:00:01 +0100 |
| commit | 944fdd173f40c0fcc718d6aa2af191bf993adc70 (patch) | |
| tree | 28436adf7e20c58427c8d48685d944b964e11147 /src/Blocks | |
| parent | Merge pull request #3430 from cuberite/Overrides (diff) | |
| download | cuberite-WarningsFixes.tar cuberite-WarningsFixes.tar.gz cuberite-WarningsFixes.tar.bz2 cuberite-WarningsFixes.tar.lz cuberite-WarningsFixes.tar.xz cuberite-WarningsFixes.tar.zst cuberite-WarningsFixes.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Blocks/BlockChest.h | 6 | ||||
| -rw-r--r-- | src/Blocks/BlockEnderchest.h | 6 | ||||
| -rw-r--r-- | src/Blocks/BlockHandler.cpp | 2 | ||||
| -rw-r--r-- | src/Blocks/BlockSnow.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/Blocks/BlockChest.h b/src/Blocks/BlockChest.h index 2c34beeeb..70bb05889 100644 --- a/src/Blocks/BlockChest.h +++ b/src/Blocks/BlockChest.h @@ -142,11 +142,11 @@ public: { a_Yaw += 90 + 45; // So its not aligned with axis - if (a_Yaw > 360.f) + if (a_Yaw > 360) { - a_Yaw -= 360.f; + a_Yaw -= 360; } - if ((a_Yaw >= 0.f) && (a_Yaw < 90.f)) + if ((a_Yaw >= 0) && (a_Yaw < 90)) { return 0x04; } diff --git a/src/Blocks/BlockEnderchest.h b/src/Blocks/BlockEnderchest.h index b5f015ff4..73eebc367 100644 --- a/src/Blocks/BlockEnderchest.h +++ b/src/Blocks/BlockEnderchest.h @@ -38,11 +38,11 @@ public: { a_Rotation += 90 + 45; // So its not aligned with axis - if (a_Rotation > 360.f) + if (a_Rotation > 360) { - a_Rotation -= 360.f; + a_Rotation -= 360; } - if ((a_Rotation >= 0.f) && (a_Rotation < 90.f)) + if ((a_Rotation >= 0) && (a_Rotation < 90)) { return 0x4; } diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp index be254900d..5221ebdab 100644 --- a/src/Blocks/BlockHandler.cpp +++ b/src/Blocks/BlockHandler.cpp @@ -583,7 +583,7 @@ bool cBlockHandler::DoesDropOnUnsuitable(void) /* default functionality: only test for height, since we assume full voxels with varying height */ bool cBlockHandler::IsInsideBlock(const Vector3d & a_Position, const BLOCKTYPE a_BlockType, const NIBBLETYPE a_BlockMeta) { - return a_Position.y < cBlockInfo::GetBlockHeight(a_BlockType); + return a_Position.y < static_cast<double>(cBlockInfo::GetBlockHeight(a_BlockType)); } diff --git a/src/Blocks/BlockSnow.h b/src/Blocks/BlockSnow.h index d11c444b9..730fad8a8 100644 --- a/src/Blocks/BlockSnow.h +++ b/src/Blocks/BlockSnow.h @@ -91,7 +91,7 @@ public: virtual bool IsInsideBlock(const Vector3d & a_Position, const BLOCKTYPE a_BlockType, const NIBBLETYPE a_BlockMeta) override { - return a_Position.y < (cBlockInfo::GetBlockHeight(a_BlockType) * (a_BlockMeta & 7)); + return a_Position.y < (static_cast<double>(cBlockInfo::GetBlockHeight(a_BlockType)) * (a_BlockMeta & 7)); } } ; |