fix various compiler warnings (and some unwanted case statement fallthroughs)

This commit is contained in:
hle0 2022-03-26 17:10:30 -04:00 committed by Alexander Harkness
parent de5b89dbea
commit d98e2bdaa3
9 changed files with 13 additions and 10 deletions

View File

@ -143,7 +143,7 @@ cTCPLink::cCallbacksPtr cLuaServerHandle::OnIncomingConnection(const AString & a
cCSLock Lock(m_CSConnections); cCSLock Lock(m_CSConnections);
m_Connections.push_back(res); m_Connections.push_back(res);
return std::move(res); return res;
} }

View File

@ -538,7 +538,7 @@ bool cByteBuffer::ReadUUID(cUUID & a_Value)
{ {
CHECK_THREAD CHECK_THREAD
std::array<Byte, 16> UUIDBuf; std::array<Byte, 16> UUIDBuf = {0};
if (!ReadBuf(UUIDBuf.data(), UUIDBuf.size())) if (!ReadBuf(UUIDBuf.data(), UUIDBuf.size()))
{ {
return false; return false;

View File

@ -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), 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. 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<BLOCKTYPE>(E_BLOCK_AIR);
/* We initialize these with what the foot is really IN, because for sampling we will move down with the epsilon above */ /* 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); bool IsFootInWater = IsBlockWater(BlockAtFoot);

View File

@ -2377,8 +2377,8 @@ bool cPlayer::DoesPlacingBlocksIntersectEntity(const std::initializer_list<sSetB
cBoundingBox BlockBox = cBlockHandler::For(blk.m_BlockType).GetPlacementCollisionBox( cBoundingBox BlockBox = cBlockHandler::For(blk.m_BlockType).GetPlacementCollisionBox(
m_World->GetBlock({ x - 1, y, z }), m_World->GetBlock({ x - 1, y, z }),
m_World->GetBlock({ x + 1, y, z }), m_World->GetBlock({ x + 1, y, z }),
(y == 0) ? E_BLOCK_AIR : m_World->GetBlock({ x, y - 1, z }), (y == 0) ? static_cast<BLOCKTYPE>(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 == cChunkDef::Height - 1) ? static_cast<BLOCKTYPE>(E_BLOCK_AIR) : m_World->GetBlock({ x, y + 1, z }),
m_World->GetBlock({ x, y, z - 1 }), m_World->GetBlock({ x, y, z - 1 }),
m_World->GetBlock({ x, y, z + 1 }) m_World->GetBlock({ x, y, z + 1 })
); );

View File

@ -73,7 +73,7 @@ void cFurnaceRecipe::ReloadRecipes(void)
size_t FirstCommentSymbol = ParsingLine.find('#'); size_t FirstCommentSymbol = ParsingLine.find('#');
if ((FirstCommentSymbol != AString::npos) && (FirstCommentSymbol != 0)) if ((FirstCommentSymbol != AString::npos) && (FirstCommentSymbol != 0))
{ {
ParsingLine.erase(ParsingLine.begin() + static_cast<const long>(FirstCommentSymbol), ParsingLine.end()); ParsingLine.erase(ParsingLine.begin() + static_cast<long>(FirstCommentSymbol), ParsingLine.end());
} }
if (IsOnlyWhitespace(ParsingLine)) if (IsOnlyWhitespace(ParsingLine))

View File

@ -2972,6 +2972,7 @@ void cProtocol_1_8_0::ParseItemMetadata(cItem & a_Item, const ContiguousByteBuff
{ {
a_Item.m_RepairCost = NBT.GetInt(tag); a_Item.m_RepairCost = NBT.GetInt(tag);
} }
break;
} }
default: LOGD("Unimplemented NBT data when parsing!"); break; default: LOGD("Unimplemented NBT data when parsing!"); break;
} }
@ -3940,6 +3941,8 @@ UInt8 cProtocol_1_8_0::GetProtocolEntityType(const cEntity & a_Entity)
case PType::pkFirework: return 76; case PType::pkFirework: return 76;
case PType::pkWitherSkull: return 66; case PType::pkWitherSkull: return 66;
} }
break;
} }
case Type::etFloater: return 90; case Type::etFloater: return 90;
case Type::etItemFrame: return 71; case Type::etItemFrame: return 71;

View File

@ -321,7 +321,7 @@ cTCPLink::cCallbacksPtr cServer::OnConnectionAccepted(const AString & a_RemoteIP
cClientHandlePtr NewHandle = std::make_shared<cClientHandle>(a_RemoteIPAddress, m_ClientViewDistance); cClientHandlePtr NewHandle = std::make_shared<cClientHandle>(a_RemoteIPAddress, m_ClientViewDistance);
cCSLock Lock(m_CSClients); cCSLock Lock(m_CSClients);
m_Clients.push_back(NewHandle); m_Clients.push_back(NewHandle);
return std::move(NewHandle); return NewHandle;
} }

View File

@ -43,7 +43,7 @@ void cSandSimulator::SimulateChunk(std::chrono::milliseconds a_Dt, int a_ChunkX,
continue; continue;
} }
BLOCKTYPE BlockBelow = (itr->y > 0) ? a_Chunk->GetBlock(itr->x, itr->y - 1, itr->z) : E_BLOCK_AIR; BLOCKTYPE BlockBelow = (itr->y > 0) ? a_Chunk->GetBlock(itr->x, itr->y - 1, itr->z) : static_cast<BLOCKTYPE>(E_BLOCK_AIR);
if (CanStartFallingThrough(BlockBelow)) if (CanStartFallingThrough(BlockBelow))
{ {
if (m_IsInstantFall) if (m_IsInstantFall)

View File

@ -76,7 +76,7 @@ Compression::Result Compression::Compressor::Compress(const void * const Input,
{ {
// First see if the stack buffer has enough space: // First see if the stack buffer has enough space:
{ {
Result::Static Buffer; Result::Static Buffer = {static_cast<std::byte>(0)};
const auto BytesWrittenOut = Algorithm(m_Handle, Input, Size, Buffer.data(), Buffer.size()); const auto BytesWrittenOut = Algorithm(m_Handle, Input, Size, Buffer.data(), Buffer.size());
if (BytesWrittenOut != 0) if (BytesWrittenOut != 0)
@ -189,7 +189,7 @@ Compression::Result Compression::Extractor::Extract(const ContiguousByteBufferVi
{ {
// First see if the stack buffer has enough space: // First see if the stack buffer has enough space:
{ {
Result::Static Buffer; Result::Static Buffer = {static_cast<std::byte>(0)};
size_t BytesWrittenOut; size_t BytesWrittenOut;
switch (Algorithm(m_Handle, Input.data(), Input.size(), Buffer.data(), Buffer.size(), &BytesWrittenOut)) switch (Algorithm(m_Handle, Input.data(), Input.size(), Buffer.data(), Buffer.size(), &BytesWrittenOut))