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/BlockEntities/MobSpawnerEntity.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/BlockEntities/MobSpawnerEntity.cpp') diff --git a/src/BlockEntities/MobSpawnerEntity.cpp b/src/BlockEntities/MobSpawnerEntity.cpp index 47bf85e9b..3bb04682a 100644 --- a/src/BlockEntities/MobSpawnerEntity.cpp +++ b/src/BlockEntities/MobSpawnerEntity.cpp @@ -107,7 +107,7 @@ bool cMobSpawnerEntity::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) void cMobSpawnerEntity::ResetTimer(void) { - m_SpawnDelay = static_cast(200 + m_World->GetTickRandomNumber(600)); + m_SpawnDelay = GetRandomProvider().RandInt(200, 800); m_World->BroadcastBlockEntity(m_PosX, m_PosY, m_PosZ); } @@ -138,7 +138,7 @@ void cMobSpawnerEntity::SpawnEntity(void) virtual bool Item(cChunk * a_Chunk) { - cFastRandom Random; + auto & Random = GetRandomProvider(); bool EntitiesSpawned = false; for (size_t i = 0; i < 4; i++) @@ -148,9 +148,9 @@ void cMobSpawnerEntity::SpawnEntity(void) break; } - int RelX = static_cast(m_RelX + static_cast(Random.NextFloat() - Random.NextFloat()) * 4.0); - int RelY = m_RelY + Random.NextInt(3) - 1; - int RelZ = static_cast(m_RelZ + static_cast(Random.NextFloat() - Random.NextFloat()) * 4.0); + int RelX = m_RelX + static_cast((Random.RandReal() - Random.RandReal()) * 4.0); + int RelY = m_RelY + Random.RandInt(-1, 1); + int RelZ = m_RelZ + static_cast((Random.RandReal() - Random.RandReal()) * 4.0); cChunk * Chunk = a_Chunk->GetRelNeighborChunkAdjustCoords(RelX, RelZ); if ((Chunk == nullptr) || !Chunk->IsValid()) @@ -171,7 +171,7 @@ void cMobSpawnerEntity::SpawnEntity(void) } Monster->SetPosition(PosX, RelY, PosZ); - Monster->SetYaw(Random.NextFloat() * 360.0f); + Monster->SetYaw(Random.RandReal(360.0f)); if (Chunk->GetWorld()->SpawnMobFinalize(Monster) != cEntity::INVALID_ID) { EntitiesSpawned = true; -- cgit v1.2.3