From aa3e66d13703eaf7e45350f339fd95d7cb877324 Mon Sep 17 00:00:00 2001 From: Jon Bergli Heier Date: Sat, 26 Jun 2010 19:08:20 +0200 Subject: Pass Stage::patterns to Enemy ctor to let Enemy spawn BulletPattern instances. --- engine/stage.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'engine/stage.cpp') 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::iterator it = enemy_list.begin(); it < enemy_list.end(); it++) { + (*it)->update(); + } for(std::vector::iterator it = patterns.begin(); it < patterns.end(); it++) { (*it)->update(); -- cgit v1.2.3