make gcc nag more

[blank.git] / src / ai / Spawner.cpp

diff --git a/src/ai/Spawner.cpp b/src/ai/Spawner.cpp
index 6404e443999dc2cf54bbee6e6f9be739b2e0e079..3433d0a8a0b2a2602ee44f7eab6b7effb6a2c1c9 100644 (file)
--- a/src/ai/Spawner.cpp
+++ b/src/ai/Spawner.cpp
@@ -18,11 +18,10 @@ 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)
@@ -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];
 }