Changeset 11555 for code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.cc

Timestamp:

Nov 13, 2017, 4:05:34 PM (8 years ago)

Author:

vyang

Message:

Level file: korrekte Kameraposition, Raumschiff bewegt sich nicht, schiesst aber → wird AsteroidsShip ueberhaupt geladen? AsteroidsShip: neue Steuerung (vgl Jump, Rotation muss noch angepasst werden)

File:

• code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.cc (modified) (3 diffs)

code/branches/Asteroid_HS17/src/modules/asteroids/Asteroids.cc

@@ -60 +60 @@
         this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
         this->center_ = nullptr;
+        this->lives = 3;
         bEndGame = false;
         lives = 3;
@@ -65 +66 @@
 
         // Pre-set the timer, but don't start it yet.
-        this->enemySpawnTimer_.setTimer(5.0, true, createExecutor(createFunctor(&Asteroids::spawnStone, this)));
+        //this->enemySpawnTimer_.setTimer(5.0, true, createExecutor(createFunctor(&Asteroids::spawnStone, this)));
     }
 
@@ -79 +80 @@
     }
 
-    /**
-    @brief
-        Destructor. Cleans up, if initialized.
-    */
-    Asteroids::~Asteroids()
+    void Asteroids::spawnStone(int newsize)
     {
-        if (this->isInitialized())
-            this->cleanup();
-    }
+        //no player -> should end game?
+        if(getPlayer() == nullptr) return;
+        //invalid size
+        if(newsize > 3 || newsize < 1) return;
+        AsteroidsStone* newStone;
+        newStone = new AsteroidsStone(this->center_->getContext());
+        newStone.size = newsize;
+        if(newsize == 1) newStone->addTemplate("asteroidsstone1");
+        else if(newsize == 2) newStone->addTemplate("asteroidsstone2");
+        else newStone->addTemplate("asteroidsstone3");
+        newStone->setAsteroidsPlayer(player);
 
-    /**
-    @brief
-        Cleans up the Gametype by destroying all of the objects in the game - spaceship and asteroids.
-    */
-    void Asteroids::cleanup()
-    {
-        if (this->stones_ != nullptr) // Destroy the ball, if present.
-        {
-            this->stones_->destroy();
-            this->stones_ = nullptr;
-        }
-
-        // Destroy AsteroidsShip
-
-        if (this->player != nullptr)
-        {
-            this->player->destroy();
-            this->player = nullptr;
-        }
     }