Fixed various MSVC warnings.
This commit is contained in:
parent
57952505e5
commit
bdb8830b9c
@ -276,5 +276,6 @@ private:
|
||||
return { 0, 0, 0 };
|
||||
}
|
||||
}
|
||||
UNREACHABLE(!"Unhandled block face!");
|
||||
}
|
||||
} ;
|
||||
|
@ -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)
|
||||
{
|
||||
float FinalDamage = a_RawDamage;
|
||||
float FinalDamage = static_cast<float>(a_RawDamage);
|
||||
float ArmorCover = GetArmorCoverAgainst(a_Attacker, a_DamageType, a_RawDamage);
|
||||
|
||||
ApplyArmorDamage(static_cast<int>(ArmorCover));
|
||||
|
@ -952,7 +952,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta)
|
||||
}
|
||||
|
||||
break;
|
||||
UNREACHABLE("Invalid minecart movement");
|
||||
}
|
||||
case E_META_RAIL_CURVED_ZP_XM:
|
||||
{
|
||||
@ -970,7 +969,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta)
|
||||
}
|
||||
|
||||
break;
|
||||
UNREACHABLE("Invalid minecart movement");
|
||||
}
|
||||
case E_META_RAIL_CURVED_ZM_XM:
|
||||
{
|
||||
@ -988,7 +986,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta)
|
||||
}
|
||||
|
||||
break;
|
||||
UNREACHABLE("Invalid minecart movement");
|
||||
}
|
||||
case E_META_RAIL_CURVED_ZM_XP:
|
||||
{
|
||||
@ -1006,7 +1003,6 @@ bool cMinecart::TestBlockCollision(NIBBLETYPE a_RailMeta)
|
||||
}
|
||||
|
||||
break;
|
||||
UNREACHABLE("Invalid minecart movement");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3909,4 +3909,5 @@ UInt8 cProtocol_1_8_0::GetProtocolEntityType(const cEntity & a_Entity)
|
||||
case Type::etExpOrb:
|
||||
case Type::etPainting: UNREACHABLE("Tried to spawn an unhandled entity");
|
||||
}
|
||||
UNREACHABLE("Unhandled entity kind");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user