Changeset 12395

Timestamp:

May 16, 2019, 7:16:49 PM (6 years ago)

Author:

pomselj

Message:

kinda done

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

• OrxoBlox.cc (modified) (7 diffs)
• OrxoBlox.h (modified) (1 diff)
• OrxoBloxWall.cc (modified) (2 diffs)
• OrxoBloxWall.h (modified) (2 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

@@ -112 +112 @@
             }
         */
+
+        for (OrxoBloxStones* stone : ObjectList<OrxoBloxStones>()) {
+            if(stone != nullptr)
+            stone->destroy();
+        }
+
+
         for (OrxoBloxWall* wall : this->activeWalls_) {
             if (wall != nullptr)
@@ -117 +124 @@
         }
         this->activeWalls_.clear();
-        
-
-        for (OrxoBloxStones* stone : this->stones_) {
-            if(stone != nullptr)
-            stone->destroy();
-        }
+
         this->stones_.clear();
         if(this->playership != nullptr) {
@@ -189 +191 @@
         // Call end for the parent class.
         Deathmatch::end();
-        GSLevel::startMainMenu();
+        //GSLevel::startMainMenu();
     }
 
@@ -214 +216 @@
 
         orxout() << "level up called" << endl;
-        //this->playerScored(this->player_);// add points
+        this->playerScored(this->player_);// add points
 
         this->createWall();
         this->activeWalls_.push_back(this->futureWall_);
-/*        for (int i = 0; i < this->futureWall_->getNumberOfStones(); i++) {
+        for (int i = 0; i < this->futureWall_->getNumberOfStones(); i++) {
             this->stones_.push_back(this->futureWall_->getStone(i));
-        }*/
+        }
 
         for(OrxoBloxWall* wall : this->activeWalls_) {
@@ -244 +246 @@
         //create balls
         //insert new wall
-        for(OrxoBloxStones* stone : this->stones_){
-            if (stone != nullptr) {
+        for(OrxoBloxStones* stone : ObjectList<OrxoBloxStones>()){
+            if (stone->isA(Class(OrxoBloxStones))) {
                 int x_=(stone->getPosition()).x;
                 int y_=(stone->getPosition()).y;
@@ -256 +258 @@
                     this->end();
                 }
+            }
+            else {
+                stone = nullptr;
             }
         }
@@ -341 +346 @@
   */  
     void OrxoBlox::count() {
-        if(this->counter >= this->max_counter) {
+        if(++(this->counter) >= this->max_counter) {
             this->LevelUp();
             counter = 0;
             return;
         }
-        else {
-            this->counter++;
-        }
     }
 

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h

@@ -111 +111 @@
             std::vector<OrxoBloxStones*> stones_; //!< A list of all stones in play.
             int counter;
-            const int max_counter = 10;
+            const int max_counter = 4;
 
     };

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc

@@ -61 +61 @@
         }
 
-        this->num_Stones_ = TotalStones_.size();
-
 
 
@@ -97 +95 @@
 
     int OrxoBloxWall::getNumberOfStones() {
-        return num_Stones_;
+        return TotalStones_.size();
     }
 

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.h

@@ -46 +46 @@
             void reduceNumberOfStones();
             void setNumberOfStones(int number);
+            std::vector<OrxoBloxStones*> TotalStones_;
         private:
             void createWall(void);
@@ -51 +52 @@
             unsigned int totalhealth_;
             unsigned int num_Stones_;
-            unsigned int size_;
-            std::vector<OrxoBloxStones*> TotalStones_; //!< A list of all stones in a Wall.
+            unsigned int size_; //!< A list of all stones in a Wall.
             bool delay_;
             OrxoBlox* orxoblox_;