From d98e2bdaa3903de29f62791c05472a693b0ea36b Mon Sep 17 00:00:00 2001 From: hle0 <91701075+hle0@users.noreply.github.com> Date: Sat, 26 Mar 2022 17:10:30 -0400 Subject: fix various compiler warnings (and some unwanted case statement fallthroughs) --- src/Entities/Pawn.cpp | 2 +- src/Entities/Player.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Entities') diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp index 760c9c0e6..361450349 100644 --- a/src/Entities/Pawn.cpp +++ b/src/Entities/Pawn.cpp @@ -320,7 +320,7 @@ void cPawn::HandleFalling(void) With this in mind, we first check the block at the player's feet, then the one below that (because fences), and decide which behaviour we want to go with. */ - BLOCKTYPE BlockAtFoot = (cChunkDef::IsValidHeight(POSY_TOINT)) ? GetWorld()->GetBlock(POS_TOINT) : E_BLOCK_AIR; + BLOCKTYPE BlockAtFoot = (cChunkDef::IsValidHeight(POSY_TOINT)) ? GetWorld()->GetBlock(POS_TOINT) : static_cast(E_BLOCK_AIR); /* We initialize these with what the foot is really IN, because for sampling we will move down with the epsilon above */ bool IsFootInWater = IsBlockWater(BlockAtFoot); diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 3fd2aac48..c2c3b51ea 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -2377,8 +2377,8 @@ bool cPlayer::DoesPlacingBlocksIntersectEntity(const std::initializer_listGetBlock({ x - 1, y, z }), m_World->GetBlock({ x + 1, y, z }), - (y == 0) ? E_BLOCK_AIR : m_World->GetBlock({ x, y - 1, z }), - (y == cChunkDef::Height - 1) ? E_BLOCK_AIR : m_World->GetBlock({ x, y + 1, z }), + (y == 0) ? static_cast(E_BLOCK_AIR) : m_World->GetBlock({ x, y - 1, z }), + (y == cChunkDef::Height - 1) ? static_cast(E_BLOCK_AIR) : m_World->GetBlock({ x, y + 1, z }), m_World->GetBlock({ x, y, z - 1 }), m_World->GetBlock({ x, y, z + 1 }) ); -- cgit v1.2.3