Pass Stage::patterns to Enemy ctor to let Enemy spawn BulletPattern instances.

1 files changed, 10 insertions, 6 deletions

diff --git a/engine/stage.cpp b/engine/stage.cpp
index 6bcd622..84a4cc7 100644
--- a/engine/stage.cpp
+++ b/engine/stage.cpp
@@ -15,15 +15,15 @@ Stage::Stage() {
 	texture = new TextureSDL("textures/shot1.png");
 	shader = new GLShaderProgram();
 	
-	enemy_list.push_back(new Enemy(Vector2(0.25, 0.75)));
-	enemy_list.push_back(new Enemy(Vector2(0.75, 0.75)));
+	enemy_list.push_back(new Enemy(Vector2(0.25, 0.75), patterns));
+	enemy_list.push_back(new Enemy(Vector2(0.75, 0.75), patterns));
 	
-	patterns.push_back(new BulletPattern3(Vector2(0.5, 0.5)));
-	patterns.push_back(new BulletPattern1(Vector2(0.5, 0.8)));
+	//patterns.push_back(new BulletPattern3(Vector2(0.5, 0.5)));
+	//patterns.push_back(new BulletPattern1(Vector2(0.5, 0.8)));
 	//patterns.push_back(new BulletPattern2(Vector2(0.2, 0.5)));
-	patterns.push_back(new BulletPattern2(Vector2(0.5, 0.5)));
+	//patterns.push_back(new BulletPattern2(Vector2(0.5, 0.5)));
 	//patterns.push_back(new BulletPattern2(Vector2(0.8, 0.5)));
-	patterns.push_back(new BulletPattern4(Vector2(0.5, 0.8)));
+	//patterns.push_back(new BulletPattern4(Vector2(0.5, 0.8)));
 	
 	GLFragmentShader shader1("shaders/bullet_fragment.glsl");
 	GLVertexShader shader2("shaders/bullet_vertex.glsl");
@@ -34,6 +34,10 @@ Stage::Stage() {
 
 void Stage::update() {
 	player->update();
+
+	for(std::vector<Enemy*>::iterator it = enemy_list.begin(); it < enemy_list.end(); it++) {
+		(*it)->update();
+	}
 	
 	for(std::vector<BulletPattern*>::iterator it = patterns.begin(); it < patterns.end(); it++) {
 		(*it)->update();