Changeset 12384

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

Files:

• OrxoBlox/CMakeLists.txt (modified) (1 diff)
• OrxoBlox/OrxoBlox.cc (modified) (2 diffs)
• weapons/projectiles/BallProjectile.cc (modified) (5 diffs)
• weapons/projectiles/BallProjectile.h (modified) (3 diffs)
• weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)

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();
+            }
+            }
+            
+        }
+
         
     }

code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc

@@ -33 +33 @@
 
 #include "BallProjectile.h"
-#include "../OrxoBlox/OrxoBlox.h"
-#include "../OrxoBlox/OrxoBloxStones.h"
 #include "gametypes/Gametype.h"
 
@@ -60 +58 @@
         this->fieldWidth_ = 46;
         this->fieldHeight_ =  49;
-        //this->orxoblox_ = this->getOrxoBlox();
+        this->orxoblox_ = this->getOrxoBlox();
 
         //setEffect("Orxonox/sparks2");
@@ -149 +147 @@
 
 
-    /*
+    
     OrxoBlox* BallProjectile::getOrxoBlox()
     {
@@ -160 +158 @@
         return nullptr;
     }
-    */
+    
 
 
@@ -185 +183 @@
                 position.z = this-> fieldHeight_;
                 
-                //orxoblox_->LevelUp();
+                orxoblox_->LevelUp();
 
 

code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.h

@@ -37 +37 @@
 #include "weapons/WeaponsPrereqs.h"
 #include "weapons/projectiles/BillboardProjectile.h"
-#include "../OrxoBlox/OrxoBlox.h"
+#include "../../OrxoBlox/OrxoBlox.h"
+#include "../../OrxoBlox/OrxoBloxStones.h"
 
 #include "OrxoBlox/OrxoBloxPrereqs.h"
@@ -68 +69 @@
             void registerVariables();
             void changeTexture();
-            //OrxoBlox* getOrxoBlox();
+            OrxoBlox* getOrxoBlox();
             
             float speed_; //!< The speed (in x-direction) of the ball.
@@ -76 +77 @@
             unsigned int maxTextureIndex_; //!< The maximal index.
             std::string materialBase_; //!< The base name of the material.
-            //OrxoBlox* orxoblox_;
+            OrxoBlox* orxoblox_;
     };
 }

code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/CMakeLists.txt

@@ -15 +15 @@
   MineProjectile.cc
   WagnisProjectile.cc
-  BallProjectile.cc
+  #BallProjectile.cc
 )

code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -14 +14 @@
   MineGun.cc
   WagnisGun.cc
-  BallGun.cc
+  #BallGun.cc
 )