make gcc nag more

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

diff --git a/src/ai/Spawner.cpp b/src/ai/Spawner.cpp
index 7b6e4b2e8b730cb31ca91f133d9010e5e3caeca8..3433d0a8a0b2a2602ee44f7eab6b7effb6a2c1c9 100644 (file)
--- a/src/ai/Spawner.cpp
+++ b/src/ai/Spawner.cpp
@@ -1,7 +1,7 @@
 #include "Spawner.hpp"
 
-#include "Chaser.hpp"
-#include "RandomWalk.hpp"
+#include "AIController.hpp"
+
 #include "../model/Model.hpp"
 #include "../model/ModelRegistry.hpp"
 #include "../rand/GaloisLFSR.hpp"
@@ -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)
-, controllers()
-, random(rand)
+, entities()
 , 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()) {
@@ -34,8 +33,8 @@ Spawner::Spawner(World &world, ModelRegistry &models, GaloisLFSR &rand)
 }
 
 Spawner::~Spawner() {
-       for (auto &ctrl : controllers) {
-               delete ctrl;
+       for (Entity *e : entities) {
+               e->UnRef();
        }
 }
 
@@ -55,35 +54,32 @@ void Spawner::Update(int dt) {
        if (timer.Hit()) {
                TrySpawn();
        }
-       for (auto &ctrl : controllers) {
-               ctrl->Update(dt);
-       }
 }
 
 
 void Spawner::CheckDespawn() noexcept {
        const auto &refs = world.Players();
-       for (auto iter = controllers.begin(), end = controllers.end(); iter != end;) {
-               Entity &e = (*iter)->Controlled();
+       for (auto iter = entities.begin(), end = entities.end(); iter != end;) {
+               Entity &e = (**iter);
                if (e.Dead()) {
-                       delete *iter;
-                       iter = controllers.erase(iter);
-                       end = controllers.end();
+                       e.UnRef();
+                       iter = entities.erase(iter);
+                       end = entities.end();
                        continue;
                }
                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;
                        }
                }
                if (!safe) {
                        e.Kill();
-                       delete *iter;
-                       iter = controllers.erase(iter);
-                       end = controllers.end();
+                       e.UnRef();
+                       iter = entities.erase(iter);
+                       end = entities.end();
                } else {
                        ++iter;
                }
@@ -91,18 +87,18 @@ void Spawner::CheckDespawn() noexcept {
 }
 
 void Spawner::TrySpawn() {
-       if (controllers.size() >= max_entities || model_length == 0) return;
+       if (entities.size() >= max_entities || model_length == 0) return;
 
        // 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());
@@ -124,25 +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());
-       Controller *ctrl;
-       if (random()) {
-               ctrl = new RandomWalk(e, random.Next<std::uint64_t>());
-               e.Name("walker");
-       } else {
-               ctrl = new Chaser(world, e, reference);
-               e.Name("chaser");
-       }
-       controllers.emplace_back(ctrl);
+       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];
 }