flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed various MSVC warnings.

This commit is contained in:
Mattes D 2020-05-06 09:24:39 +02:00 committed by peterbell10
parent 57952505e5
commit bdb8830b9c
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Blocks/BlockButton.h
View File

@ -276,5 +276,6 @@ private:
return { 0, 0, 0 }; return { 0, 0, 0 };
} }
} }
UNREACHABLE(!"Unhandled block face!");
} }
} ; } ;

2
src/Entities/Entity.cpp
View File

@ -282,7 +282,7 @@ void cEntity::TakeDamage(cEntity & a_Attacker)
void cEntity::TakeDamage(eDamageType a_DamageType, cEntity * a_Attacker, int a_RawDamage, double a_KnockbackAmount) void cEntity::TakeDamage(eDamageType a_DamageType, cEntity * a_Attacker, int a_RawDamage, double a_KnockbackAmount)
{ {
float FinalDamage = a_RawDamage; float FinalDamage = static_cast<float>(a_RawDamage);
float ArmorCover = GetArmorCoverAgainst(a_Attacker, a_DamageType, a_RawDamage); float ArmorCover = GetArmorCoverAgainst(a_Attacker, a_DamageType, a_RawDamage);
ApplyArmorDamage(static_cast<int>(ArmorCover)); ApplyArmorDamage(static_cast<int>(ArmorCover));

4
src/Entities/Minecart.cpp
View File

@ -952,7 +952,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta)
} }
break; break;
UNREACHABLE("Invalid minecart movement");
} }
case E_META_RAIL_CURVED_ZP_XM: case E_META_RAIL_CURVED_ZP_XM:
{ {
@ -970,7 +969,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta)
} }
break; break;
UNREACHABLE("Invalid minecart movement");
} }
case E_META_RAIL_CURVED_ZM_XM: case E_META_RAIL_CURVED_ZM_XM:
{ {
@ -988,7 +986,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta)
} }
break; break;
UNREACHABLE("Invalid minecart movement");
} }
case E_META_RAIL_CURVED_ZM_XP: case E_META_RAIL_CURVED_ZM_XP:
{ {
@ -1006,7 +1003,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta)
} }
break; break;
UNREACHABLE("Invalid minecart movement");
} }
} }

1
src/Protocol/Protocol_1_8.cpp
View File

@ -3909,4 +3909,5 @@ UInt8 cProtocol_1_8_0::GetProtocolEntityType(const cEntity & a_Entity)
case Type::etExpOrb: case Type::etExpOrb:
case Type::etPainting: UNREACHABLE("Tried to spawn an unhandled entity"); case Type::etPainting: UNREACHABLE("Tried to spawn an unhandled entity");
} }
UNREACHABLE("Unhandled entity kind");
} }