X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fai%2FSpawner.cpp;h=3433d0a8a0b2a2602ee44f7eab6b7effb6a2c1c9;hb=20d0a76d2519c71009c3b3babec0df27529f8142;hp=94220d4af0f608b7b761cabf4c75c7cae608c0a7;hpb=150d065f431d665326fd8028748c48a74ad956bb;p=blank.git

diff --git a/src/ai/Spawner.cpp b/src/ai/Spawner.cpp
index 94220d4..3433d0a 100644
--- a/src/ai/Spawner.cpp
+++ b/src/ai/Spawner.cpp
@@ -18,15 +18,14 @@ using namespace std;
 
 namespace blank {
 
-Spawner::Spawner(World &world, ModelRegistry &models, GaloisLFSR &rand)
+Spawner::Spawner(World &world, ModelRegistry &models)
 : world(world)
 , models(models)
 , entities()
-, random(rand)
 , timer(64)
 , despawn_range(128 * 128)
 , spawn_distance(16 * 16)
-, max_entities(16)
+, max_entities(32)
 , chunk_range(4)
 , model_offset(0)
 , model_length(models.size()) {
@@ -71,7 +70,7 @@ void Spawner::CheckDespawn() noexcept {
 		bool safe = false;
 		for (const Player &ref : refs) {
 			glm::vec3 diff(ref.GetEntity().AbsoluteDifference(e));
-			if (dot(diff, diff) < despawn_range) {
+			if (glm::length2(diff) < despawn_range) {
 				safe = true;
 				break;
 			}
@@ -93,13 +92,13 @@ void Spawner::TrySpawn() {
 	// select random player to punish
 	auto &players = world.Players();
 	if (players.size() == 0) return;
-	size_t player_num = random.Next<unsigned short>() % players.size();
+	size_t player_num = world.Random().Next<unsigned short>() % players.size();
 	auto i = players.begin(), end = players.end();
 	for (; player_num > 0 && i != end; ++i, --player_num) {
 	}
 	const Player &player = *i;
 
-	BlockLookup spawn_block(player.GetChunks().RandomBlock(random));
+	BlockLookup spawn_block(player.GetChunks().RandomBlock(world.Random()));
 
 	// distance check
 	//glm::vec3 diff(glm::vec3(chunk * Chunk::Extent() - pos) + player.entity->Position());
@@ -121,20 +120,20 @@ void Spawner::TrySpawn() {
 	Spawn(player.GetEntity(), spawn_block.GetChunk().Position(), spawn_block.GetBlockCoords());
 }
 
-void Spawner::Spawn(Entity &reference, const glm::ivec3 &chunk, const glm::vec3 &pos) {
+void Spawner::Spawn(Entity &, const glm::ivec3 &chunk, const glm::vec3 &pos) {
 	Entity &e = world.AddEntity();
 	e.Position(chunk, pos);
 	e.Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } });
 	e.WorldCollidable(true);
 	RandomModel().Instantiate(e.GetModel());
-	e.SetController(new AIController(random));
+	e.SetController(new AIController(world, e));
 	e.Name("spawned");
 	e.Ref();
 	entities.emplace_back(&e);
 }
 
 Model &Spawner::RandomModel() noexcept {
-	std::size_t offset = (random.Next<std::size_t>() % model_length) + model_offset;
+	std::size_t offset = (world.Random().Next<std::size_t>() % model_length) + model_offset;
 	return models[offset];
 }