From 360d8eade0332f2c1aa5c205ca772cd506c35b26 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Tue, 13 Jun 2017 20:35:30 +0100 Subject: FastRandom rewrite (#3754) --- src/Entities/Player.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/Entities/Player.cpp') diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index b11c07a0b..7232ed614 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -1069,9 +1069,9 @@ void cPlayer::KilledBy(TakeDamageInfo & a_TDI) { case dtRangedAttack: DamageText = "was shot"; break; case dtLightning: DamageText = "was plasmified by lightining"; break; - case dtFalling: DamageText = (GetWorld()->GetTickRandomNumber(10) % 2 == 0) ? "fell to death" : "hit the ground too hard"; break; + case dtFalling: DamageText = GetRandomProvider().RandBool() ? "fell to death" : "hit the ground too hard"; break; case dtDrowning: DamageText = "drowned"; break; - case dtSuffocating: DamageText = (GetWorld()->GetTickRandomNumber(10) % 2 == 0) ? "git merge'd into a block" : "fused with a block"; break; + case dtSuffocating: DamageText = GetRandomProvider().RandBool() ? "git merge'd into a block" : "fused with a block"; break; case dtStarving: DamageText = "forgot the importance of food"; break; case dtCactusContact: DamageText = "was impaled on a cactus"; break; case dtLavaContact: DamageText = "was melted by lava"; break; @@ -2295,18 +2295,17 @@ void cPlayer::UseEquippedItem(int a_Amount) int UnbreakingLevel = static_cast(Item.m_Enchantments.GetLevel(cEnchantments::enchUnbreaking)); if (UnbreakingLevel > 0) { - int chance; + double chance = 0.0; if (ItemCategory::IsArmor(Item.m_ItemType)) { - chance = 60 + (40 / (UnbreakingLevel + 1)); + chance = 0.6 + (0.4 / (UnbreakingLevel + 1)); } else { - chance = 100 / (UnbreakingLevel + 1); + chance = 1.0 / (UnbreakingLevel + 1); } - cFastRandom Random; - if (Random.NextInt(101) <= chance) + if (GetRandomProvider().RandBool(chance)) { return; } -- cgit v1.2.3