From 804805d35a87c2acc9425d1762ad26b1ba2ec9ac Mon Sep 17 00:00:00 2001 From: Samuel Barney Date: Wed, 29 Jul 2015 09:04:03 -0600 Subject: Silenced and fixed many warning messages across multiple files. --- src/Blocks/BlockAnvil.h | 4 ++-- src/Blocks/BlockCocoaPod.h | 2 +- src/Blocks/BlockCrops.h | 6 +++--- src/Blocks/BlockGlowstone.h | 2 +- src/Blocks/BlockLeaves.h | 4 ++-- src/Blocks/BlockLever.h | 2 +- src/Blocks/BlockMelon.h | 2 +- src/Blocks/BlockMobHead.h | 2 +- src/Blocks/BlockMobSpawner.h | 2 +- src/Blocks/BlockNetherWart.h | 2 +- src/Blocks/BlockOre.h | 4 ++-- src/Blocks/BlockPiston.cpp | 4 ++-- src/Blocks/BlockPlanks.h | 2 +- src/Blocks/BlockQuartz.h | 2 +- src/Blocks/BlockSeaLantern.h | 2 +- src/Blocks/BlockSideways.h | 2 +- src/Blocks/BlockSignPost.h | 2 +- src/Blocks/BlockTrapdoor.h | 2 +- src/Blocks/BlockVine.h | 4 ++-- src/Blocks/CMakeLists.txt | 5 ----- 20 files changed, 26 insertions(+), 31 deletions(-) (limited to 'src/Blocks') diff --git a/src/Blocks/BlockAnvil.h b/src/Blocks/BlockAnvil.h index a2a7c0cf4..ebfe472c5 100644 --- a/src/Blocks/BlockAnvil.h +++ b/src/Blocks/BlockAnvil.h @@ -38,8 +38,8 @@ public: ) override { a_BlockType = m_BlockType; - NIBBLETYPE Meta = (NIBBLETYPE)a_Player->GetEquippedItem().m_ItemDamage; - int Direction = (int)floor(a_Player->GetYaw() * 4.0 / 360.0 + 1.5) & 0x3; + NIBBLETYPE Meta = static_cast(a_Player->GetEquippedItem().m_ItemDamage); + int Direction = static_cast(floor(a_Player->GetYaw() * 4.0 / 360.0 + 1.5)) & 0x3; switch (Direction) { diff --git a/src/Blocks/BlockCocoaPod.h b/src/Blocks/BlockCocoaPod.h index d061fbdd5..a48bfdfc2 100644 --- a/src/Blocks/BlockCocoaPod.h +++ b/src/Blocks/BlockCocoaPod.h @@ -41,7 +41,7 @@ public: if (GrowState < 2) { ++GrowState; - a_Chunk.SetMeta(a_RelX, a_RelY, a_RelZ, (NIBBLETYPE) (GrowState << 2 | TypeMeta)); + a_Chunk.SetMeta(a_RelX, a_RelY, a_RelZ, static_cast(GrowState << 2 | TypeMeta)); } } } diff --git a/src/Blocks/BlockCrops.h b/src/Blocks/BlockCrops.h index e510d5f8d..c54625561 100644 --- a/src/Blocks/BlockCrops.h +++ b/src/Blocks/BlockCrops.h @@ -30,17 +30,17 @@ public: case E_BLOCK_CROPS: { a_Pickups.push_back(cItem(E_ITEM_WHEAT, 1, 0)); - a_Pickups.push_back(cItem(E_ITEM_SEEDS, (char)(1 + (rand.NextInt(3) + rand.NextInt(3)) / 2), 0)); // [1 .. 3] with high preference of 2 + a_Pickups.push_back(cItem(E_ITEM_SEEDS, static_cast(1 + (rand.NextInt(3) + rand.NextInt(3)) / 2), 0)); // [1 .. 3] with high preference of 2 break; } case E_BLOCK_CARROTS: { - a_Pickups.push_back(cItem(E_ITEM_CARROT, (char)(1 + (rand.NextInt(3) + rand.NextInt(3)) / 2), 0)); // [1 .. 3] with high preference of 2 + a_Pickups.push_back(cItem(E_ITEM_CARROT, static_cast(1 + (rand.NextInt(3) + rand.NextInt(3)) / 2), 0)); // [1 .. 3] with high preference of 2 break; } case E_BLOCK_POTATOES: { - a_Pickups.push_back(cItem(E_ITEM_POTATO, (char)(1 + (rand.NextInt(3) + rand.NextInt(3)) / 2), 0)); // [1 .. 3] with high preference of 2 + a_Pickups.push_back(cItem(E_ITEM_POTATO, static_cast(1 + (rand.NextInt(3) + rand.NextInt(3)) / 2), 0)); // [1 .. 3] with high preference of 2 if (rand.NextInt(21) == 0) { // With a 5% chance, drop a poisonous potato as well diff --git a/src/Blocks/BlockGlowstone.h b/src/Blocks/BlockGlowstone.h index 2781a7206..cb36b9a73 100644 --- a/src/Blocks/BlockGlowstone.h +++ b/src/Blocks/BlockGlowstone.h @@ -21,7 +21,7 @@ public: cFastRandom Random; // Add more than one dust - a_Pickups.push_back(cItem(E_ITEM_GLOWSTONE_DUST, (char)(2 + Random.NextInt(3)), 0)); + a_Pickups.push_back(cItem(E_ITEM_GLOWSTONE_DUST, static_cast(2 + Random.NextInt(3)), 0)); } virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override diff --git a/src/Blocks/BlockLeaves.h b/src/Blocks/BlockLeaves.h index 06c41369d..2017c391b 100644 --- a/src/Blocks/BlockLeaves.h +++ b/src/Blocks/BlockLeaves.h @@ -14,9 +14,9 @@ #define PROCESS_NEIGHBOR(x, y, z) \ switch (a_Area.GetBlockType(x, y, z)) \ { \ - case E_BLOCK_LEAVES: a_Area.SetBlockType(x, y, z, (BLOCKTYPE)(E_BLOCK_SPONGE + i + 1)); break; \ + case E_BLOCK_LEAVES: a_Area.SetBlockType(x, y, z, static_cast(E_BLOCK_SPONGE + i + 1)); break; \ case E_BLOCK_LOG: return true; \ - case E_BLOCK_NEW_LEAVES: a_Area.SetBlockType(x, y, z, (BLOCKTYPE)(E_BLOCK_SPONGE + i + 1)); break; \ + case E_BLOCK_NEW_LEAVES: a_Area.SetBlockType(x, y, z, static_cast(E_BLOCK_SPONGE + i + 1)); break; \ case E_BLOCK_NEW_LOG: return true; \ } diff --git a/src/Blocks/BlockLever.h b/src/Blocks/BlockLever.h index 840a61e60..698b74ec8 100644 --- a/src/Blocks/BlockLever.h +++ b/src/Blocks/BlockLever.h @@ -24,7 +24,7 @@ public: a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta); a_WorldInterface.WakeUpSimulators(a_BlockX, a_BlockY, a_BlockZ); - a_WorldInterface.GetBroadcastManager().BroadcastSoundEffect("random.click", (double)a_BlockX, (double)a_BlockY, (double)a_BlockZ, 0.5f, (Meta & 0x08) ? 0.6f : 0.5f); + a_WorldInterface.GetBroadcastManager().BroadcastSoundEffect("random.click", static_cast(a_BlockX), static_cast(a_BlockY), static_cast(a_BlockZ), 0.5f, (Meta & 0x08) ? 0.6f : 0.5f); } virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override diff --git a/src/Blocks/BlockMelon.h b/src/Blocks/BlockMelon.h index e97df723d..4743e5c98 100644 --- a/src/Blocks/BlockMelon.h +++ b/src/Blocks/BlockMelon.h @@ -19,7 +19,7 @@ public: virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { cFastRandom Random; - a_Pickups.push_back(cItem(E_ITEM_MELON_SLICE, (char)(3 + Random.NextInt(5)), 0)); + a_Pickups.push_back(cItem(E_ITEM_MELON_SLICE, static_cast(3 + Random.NextInt(5)), 0)); } virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override diff --git a/src/Blocks/BlockMobHead.h b/src/Blocks/BlockMobHead.h index 639b83a03..72face3a2 100644 --- a/src/Blocks/BlockMobHead.h +++ b/src/Blocks/BlockMobHead.h @@ -41,7 +41,7 @@ public: cMobHeadEntity * MobHeadEntity = static_cast(a_BlockEntity); cItems Pickups; - Pickups.Add(E_ITEM_HEAD, 1, (short) MobHeadEntity->GetType()); + Pickups.Add(E_ITEM_HEAD, 1, static_cast(MobHeadEntity->GetType())); MTRand r1; // Mid-block position first diff --git a/src/Blocks/BlockMobSpawner.h b/src/Blocks/BlockMobSpawner.h index d5e7c273f..4f389c397 100644 --- a/src/Blocks/BlockMobSpawner.h +++ b/src/Blocks/BlockMobSpawner.h @@ -47,6 +47,6 @@ public: cFastRandom Random; int Reward = 15 + Random.NextInt(15) + Random.NextInt(15); - a_WorldInterface.SpawnExperienceOrb((double)a_BlockX, (double)a_BlockY + 1, (double)a_BlockZ, Reward); + a_WorldInterface.SpawnExperienceOrb(static_cast(a_BlockX), static_cast(a_BlockY + 1), static_cast(a_BlockZ), Reward); } } ; diff --git a/src/Blocks/BlockNetherWart.h b/src/Blocks/BlockNetherWart.h index 424730796..6a76e0828 100644 --- a/src/Blocks/BlockNetherWart.h +++ b/src/Blocks/BlockNetherWart.h @@ -25,7 +25,7 @@ public: if (a_Meta == 0x7) { // Fully grown, drop the entire produce: - a_Pickups.push_back(cItem(E_ITEM_NETHER_WART, (char)(1 + (rand.NextInt(3) + rand.NextInt(3))) / 2, 0)); + a_Pickups.push_back(cItem(E_ITEM_NETHER_WART, static_cast(1 + (rand.NextInt(3) + rand.NextInt(3))) / 2, 0)); } else { diff --git a/src/Blocks/BlockOre.h b/src/Blocks/BlockOre.h index 7e67e3450..70d599843 100644 --- a/src/Blocks/BlockOre.h +++ b/src/Blocks/BlockOre.h @@ -26,13 +26,13 @@ public: { case E_BLOCK_LAPIS_ORE: { - a_Pickups.push_back(cItem(E_ITEM_DYE, (char)(4 + Random.NextInt(5)), 4)); + a_Pickups.push_back(cItem(E_ITEM_DYE, static_cast(4 + Random.NextInt(5)), 4)); break; } case E_BLOCK_REDSTONE_ORE: case E_BLOCK_REDSTONE_ORE_GLOWING: { - a_Pickups.push_back(cItem(E_ITEM_REDSTONE_DUST, (char)(4 + Random.NextInt(2)), 0)); + a_Pickups.push_back(cItem(E_ITEM_REDSTONE_DUST, static_cast(4 + Random.NextInt(2)), 0)); break; } case E_BLOCK_DIAMOND_ORE: diff --git a/src/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp index 75f8621a7..4e4814242 100644 --- a/src/Blocks/BlockPiston.cpp +++ b/src/Blocks/BlockPiston.cpp @@ -135,7 +135,7 @@ void cBlockPistonHandler::ExtendPiston(int a_BlockX, int a_BlockY, int a_BlockZ, } a_World->BroadcastBlockAction(a_BlockX, a_BlockY, a_BlockZ, 0, pistonMeta, pistonBlock); - a_World->BroadcastSoundEffect("tile.piston.out", (double)a_BlockX, (double)a_BlockY, (double)a_BlockZ, 0.5f, 0.7f); + a_World->BroadcastSoundEffect("tile.piston.out", static_cast(a_BlockX), static_cast(a_BlockY), static_cast(a_BlockZ), 0.5f, 0.7f); // Drop the breakable block in the line, if appropriate: AddPistonDir(a_BlockX, a_BlockY, a_BlockZ, pistonMeta, dist + 1); // "a_Block" now at the breakable / empty block @@ -209,7 +209,7 @@ void cBlockPistonHandler::RetractPiston(int a_BlockX, int a_BlockY, int a_BlockZ AddPistonDir(a_BlockX, a_BlockY, a_BlockZ, pistonMeta, -1); a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, pistonBlock, pistonMeta & ~(8)); a_World->BroadcastBlockAction(a_BlockX, a_BlockY, a_BlockZ, 1, pistonMeta & ~(8), pistonBlock); - a_World->BroadcastSoundEffect("tile.piston.in", (double)a_BlockX, (double)a_BlockY, (double)a_BlockZ, 0.5f, 0.7f); + a_World->BroadcastSoundEffect("tile.piston.in", static_cast(a_BlockX), static_cast(a_BlockY), static_cast(a_BlockZ), 0.5f, 0.7f); AddPistonDir(a_BlockX, a_BlockY, a_BlockZ, pistonMeta, 1); // Retract the extension, pull block if appropriate diff --git a/src/Blocks/BlockPlanks.h b/src/Blocks/BlockPlanks.h index e913db5f6..52e8c34dc 100644 --- a/src/Blocks/BlockPlanks.h +++ b/src/Blocks/BlockPlanks.h @@ -23,7 +23,7 @@ public: ) override { a_BlockType = m_BlockType; - a_BlockMeta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage); + a_BlockMeta = static_cast(a_Player->GetEquippedItem().m_ItemDamage); return true; } diff --git a/src/Blocks/BlockQuartz.h b/src/Blocks/BlockQuartz.h index 878a12b25..b987723e8 100644 --- a/src/Blocks/BlockQuartz.h +++ b/src/Blocks/BlockQuartz.h @@ -23,7 +23,7 @@ public: ) override { a_BlockType = m_BlockType; - NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage); + NIBBLETYPE Meta = static_cast(a_Player->GetEquippedItem().m_ItemDamage); if (Meta != E_META_QUARTZ_PILLAR) // Check if the block is a pillar block. { diff --git a/src/Blocks/BlockSeaLantern.h b/src/Blocks/BlockSeaLantern.h index a9259d1d6..3454259b5 100644 --- a/src/Blocks/BlockSeaLantern.h +++ b/src/Blocks/BlockSeaLantern.h @@ -21,7 +21,7 @@ public: { // Reset meta to 0 cFastRandom Random; - a_Pickups.push_back(cItem(E_ITEM_PRISMARINE_CRYSTALS, (char)(2 + Random.NextInt(2)), 0)); + a_Pickups.push_back(cItem(E_ITEM_PRISMARINE_CRYSTALS, static_cast(2 + Random.NextInt(2)), 0)); } } ; diff --git a/src/Blocks/BlockSideways.h b/src/Blocks/BlockSideways.h index e52fbaa2f..c3fa5b3da 100644 --- a/src/Blocks/BlockSideways.h +++ b/src/Blocks/BlockSideways.h @@ -24,7 +24,7 @@ public: ) override { a_BlockType = m_BlockType; - NIBBLETYPE Meta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage); + NIBBLETYPE Meta = static_cast(a_Player->GetEquippedItem().m_ItemDamage); a_BlockMeta = BlockFaceToMetaData(a_BlockFace, Meta); return true; } diff --git a/src/Blocks/BlockSignPost.h b/src/Blocks/BlockSignPost.h index 5ae285bf0..0b122af98 100644 --- a/src/Blocks/BlockSignPost.h +++ b/src/Blocks/BlockSignPost.h @@ -46,7 +46,7 @@ public: a_Rotation = (a_Rotation / 360) * 16; - return ((char)a_Rotation) % 16; + return (static_cast(a_Rotation)) % 16; } virtual NIBBLETYPE MetaRotateCW(NIBBLETYPE a_Meta) override diff --git a/src/Blocks/BlockTrapdoor.h b/src/Blocks/BlockTrapdoor.h index 13783c16f..f7f83a61d 100644 --- a/src/Blocks/BlockTrapdoor.h +++ b/src/Blocks/BlockTrapdoor.h @@ -39,7 +39,7 @@ public: NIBBLETYPE Meta = (a_ChunkInterface.GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ) ^ 0x04); a_ChunkInterface.SetBlockMeta(a_BlockX, a_BlockY, a_BlockZ, Meta); - cWorld * World = (cWorld *) &a_WorldInterface; + cWorld * World = static_cast(&a_WorldInterface); World->BroadcastSoundParticleEffect(1003, a_BlockX, a_BlockY, a_BlockZ, 0, a_Player->GetClientHandle()); } diff --git a/src/Blocks/BlockVine.h b/src/Blocks/BlockVine.h index cc354c374..575273cde 100644 --- a/src/Blocks/BlockVine.h +++ b/src/Blocks/BlockVine.h @@ -203,13 +203,13 @@ public: virtual NIBBLETYPE MetaMirrorXY(NIBBLETYPE a_Meta) override { // Bits 2 and 4 stay, bits 1 and 3 swap - return (NIBBLETYPE)((a_Meta & 0x0a) | ((a_Meta & 0x01) << 2) | ((a_Meta & 0x04) >> 2)); + return static_cast((a_Meta & 0x0a) | ((a_Meta & 0x01) << 2) | ((a_Meta & 0x04) >> 2)); } virtual NIBBLETYPE MetaMirrorYZ(NIBBLETYPE a_Meta) override { // Bits 1 and 3 stay, bits 2 and 4 swap - return (NIBBLETYPE)((a_Meta & 0x05) | ((a_Meta & 0x02) << 2) | ((a_Meta & 0x08) >> 2)); + return static_cast((a_Meta & 0x05) | ((a_Meta & 0x02) << 2) | ((a_Meta & 0x08) >> 2)); } virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override diff --git a/src/Blocks/CMakeLists.txt b/src/Blocks/CMakeLists.txt index d8affd9cf..ed3e321d4 100644 --- a/src/Blocks/CMakeLists.txt +++ b/src/Blocks/CMakeLists.txt @@ -95,11 +95,6 @@ SET (HDRS MetaRotator.h WorldInterface.h) -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set_source_files_properties(BlockHandler.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=old-style-cast") - set_source_files_properties(BlockPiston.cpp PROPERTIES COMPILE_FLAGS "-Wno-error=old-style-cast") -endif() - if(NOT MSVC) add_library(Blocks ${SRCS} ${HDRS}) endif() -- cgit v1.2.3