Changeset 12394 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

Timestamp:

May 16, 2019, 6:27:53 PM (5 years ago)

Author:

pomselj

Message:

almost done

File:

• code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified) (4 diffs)

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

@@ -71 +71 @@
         this->player_ = nullptr;
         level_ = 0;
+        this->counter = 0;
 
         this->setHUDTemplate("OrxoBloxHUD");
@@ -144 +145 @@
         {
 
-            level_=1;
+            level_= 1;
 
         }
@@ -213 +214 @@
 
         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++) {
-            if (this->futureWall_->getStone(i) == nullptr) {
-                orxout() << "Added nullptr to std::list stones_" << endl;
-            }
-
+/*        for (int i = 0; i < this->futureWall_->getNumberOfStones(); i++) {
             this->stones_.push_back(this->futureWall_->getStone(i));
-        }
+        }*/
 
         for(OrxoBloxWall* wall : this->activeWalls_) {
+            if(wall == nullptr) {
+                continue;
+            }
             if(wall->isEmpty()) {
                 wall->destroy();
@@ -340 +340 @@
     }
   */  
+    void OrxoBlox::count() {
+        if(this->counter >= this->max_counter) {
+            this->LevelUp();
+            counter = 0;
+            return;
+        }
+        else {
+            this->counter++;
+        }
+    }
+
+
 }