Changeset 12343 for code/branches/OrxoBlox_FS19/src

Timestamp:

May 9, 2019, 11:09:18 AM (6 years ago)

Author:

ahuwyler

Message:

We have a list of all stones

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

• OrxoBlox.cc (modified) (3 diffs)
• OrxoBlox.h (modified) (2 diffs)

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

@@ -113 +113 @@
             }
 
-        // Destroy 6 bWalls, if present.
-        for (size_t i = 0; i < 6; ++i)
-        {
-            if (this->activeWalls_[0] != nullptr)
-            {
-                this->activeWalls_[0]->destroy();
-                this->activeWalls_[0] = nullptr;
-            }
-            
-        }
+        for (OrxoBloxStones* stone : this->stones_)
+            stone->destroy();
+        this->stones_.clear();
+        
 
     }
@@ -215 +209 @@
     }
 
-    //void startWall(void);
     void OrxoBlox::LevelUp(){
         level_++;
-        for(int i=8; i>-1; --i){
-            activeWalls_[i]=activeWalls_[i+1];
-        }
         this->createWall();
-        //activeWalls_[0]=
+        //this->activeWalls_.push_back(this->futureWall_);
         //When levelup? wo wird es ausgeloest?
         //new location of ship
@@ -239 +229 @@
         this->center_->attach(this->futureWall_);
         
-        
-        this->futureWall_->setPosition(0, 0, 0.0f);
+        float y_=(this->center_->getFieldDimension()).y;
+                //stone->setPosition(size_*i -x_/2 +4.5f, -3.5f, -y_/2 + 6.5f);
+        this->futureWall_->setPosition(0, 0, -y_/2 + 6.5f);
         this->futureWall_->setGame(this);
     }

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

@@ -98 +98 @@
             WeakPtr<OrxoBloxBall> ball_; //!< The OrxoBlox ball.
             unsigned int level_;
-            
+
             WeakPtr<OrxoBloxShip> playership;
             PlayerInfo* player_;
@@ -104 +104 @@
             
             WeakPtr<OrxoBloxWall> futureWall_;
-            WeakPtr<OrxoBloxWall> activeWalls_[6]; //6 is the number of wallls in the game.
+            std::vector<OrxoBloxWall*> activeWalls_;
+            std::list<StrongPtr<OrxoBloxStones>> stones_; //!< A list of all stones in play.
+
     };
 }