Changeset 12384 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Timestamp:

May 16, 2019, 4:03:46 PM (6 years ago)

Author:

pomselj

Message:

OrxoBlox is linked to Projectile, level up works

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxoBlox.cc (modified) (2 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt

@@ -7 +7 @@
   OrxoBloxScore.cc
   OrxoBloxShip.cc
+  ../weapons/weaponmodes/BallGun.cc
+  ../weapons/projectiles/BallProjectile.cc
 
 )

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

@@ -230 +230 @@
         orxout() << "level up called" << endl;
         this->playerScored(this->player_);// add points
-        for(OrxoBloxStones* stone : this->stones_){
-            int x_=(stone->getPosition()).x;
-            int y_=(stone->getPosition()).y;
-            z_=(stone->getPosition()).z;
-            //if(z_==90)this->end();
-
-            stone->setPosition(x_,y_,z_+9.0f);
-            
-        }
+        
 
 
@@ -270 +262 @@
         //create balls
         //insert new wall
-        if( z_ >= 45){
-            orxout() << "calling end() function" << endl;
-            this->end();
-            }
+        for(OrxoBloxStones* stone : this->stones_){
+            if (stone != nullptr) {
+            int x_=(stone->getPosition()).x;
+            int y_=(stone->getPosition()).y;
+            z_=(stone->getPosition()).z;
+            //if(z_==90)this->end();
+
+            stone->setPosition(x_,y_,z_+9.0f);
+            if( z_ >= 45){
+                orxout() << "calling end() function" << endl;
+                this->end();
+            }
+            }
+            
+        }
+
         
     }