Changeset 11632 for code/branches

Timestamp:

Dec 4, 2017, 4:00:44 PM (7 years ago)

Author:

zarron

Message:

Boss shoots now limited amount of Gumbas

Location:

code/branches/SOBv2_HS17/src/modules/superorxobros

Files:

• SOBGumba.h (modified) (2 diffs)
• SOBGumbaBoss.cc (modified) (3 diffs)

code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumba.h

@@ -61 +61 @@
 
             bool hasCollided_;
+            SOBGumbaBoss* creator_;
         protected:
             float gravityAcceleration_;
@@ -69 +70 @@
             bool changeAllowed_;
             float changedOn_;
-            SOBGumbaBoss* creator_;
+
            
     };

code/branches/SOBv2_HS17/src/modules/superorxobros/SOBGumbaBoss.cc

@@ -54 +54 @@
         RegisterObject(SOBGumbaBoss);
 
-        gumbaMaxTime_ = 4;
+        gumbaMaxTime_ = 1;
         gumbaTime_ = 0;
-        maxGumbas = 10; //Max Gumbas spawnable by a Boss
+        maxGumbas = 2; //Max Gumbas spawnable by a Boss
         
     }
@@ -91 +91 @@
         gumbaTime_ += dt;
 
-        if(gumbaTime_ > gumbaMaxTime_){
-            spawnGumba();
-            gumbaTime_ = 0;
+        if(gumbaTime_ > gumbaMaxTime_){ //Spawn Gumba
+            int gumbaCounter=0;
+
+            for (SOBGumba*  gumbaInstance : ObjectList<SOBGumba>())
+            {
+                if (gumbaInstance != nullptr && gumbaInstance->creator_==this)
+                {
+                    gumbaCounter++;
+                }
+            } 
+
+
+            if(gumbaCounter<maxGumbas){    
+                spawnGumba();
+                gumbaTime_ = 0;
+            }
         }
 
@@ -114 +127 @@
          Vector3 spawnpos = this->getWorldPosition();
          spawnpos.z += 0;
+         gumba->creator_=this;
 
         if (gumba != nullptr && center_ != nullptr)