pooling working

1 files changed, 4 insertions, 10 deletions

diff --git a/game/prefab/ZapperPoolSubScene.cpp b/game/prefab/ZapperPoolSubScene.cpp
index d7d30ea..923ed57 100644
--- a/game/prefab/ZapperPoolSubScene.cpp
+++ b/game/prefab/ZapperPoolSubScene.cpp
@@ -8,18 +8,12 @@ using namespace std;
 
 ZapperPoolSubScene::ZapperPoolSubScene(Scene & scene)
 	: controller { scene.new_object("controller") } {
-	this->controller.add_component<BehaviorScript>().set_script<ZapperPoolScript>(*this);
 
 	Log::logf(Log::DEBUG, "Building zapper pool...");
+	vector<ZapperObject> pool;
 	for (size_t i = 0; i < this->POOL_SIZE; i++)
-		zappers.emplace_back(scene.new_object("zapper"));
-}
-
-OptionalRef<ZapperObject> ZapperPoolSubScene::get_next_zapper() {
-	for (ZapperObject & zapper : this->zappers) {
-		if (!zapper.active) continue;
-		return zapper;
-	}
-	return {};
+		pool.emplace_back(scene.new_object("zapper"));
+	BehaviorScript & behavior = this->controller.add_component<BehaviorScript>();
+	behavior.set_script<ZapperPoolScript>(std::move(pool));
 }