Changeset 11625 for code/branches/SOBv2_HS17/src

Timestamp:

Dec 4, 2017, 2:45:06 PM (7 years ago)

Author:

varxth

Message:

improvment

File:

• code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc (modified) (2 diffs)

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

@@ -39 +39 @@
 #include "SOBFigure.h"
 #include "SOBGumba.h"
+#include "SOBGumbaBoss.h"    
 #include "SOB.h"    
 #include "util/Output.h"
@@ -106 +107 @@
         collDisZ_ = getPosition().z - contactPoint.getPositionWorldOnB().getZ();
 
-        SOBGumba* gumba = orxonox_cast<SOBGumba*>(otherObject);
-
-
-        if(gumba!=nullptr && !(gumba->hasCollided_)) //if other object is a Gumba, kill the Gumba and add score and destroy the fireball
+        SOBGumba*       gumba       = orxonox_cast<SOBGumba*>       (otherObject);
+        SOBGumbaBoss*   gumbaBoss   = orxonox_cast<SOBGumbaBoss*>   (otherObject);
+
+        if(gumbaBoss != nullptr && !(gumba->hasCollided_))
+        {
+            this->destroyLater();
+            this->hasCollided_ = true;
+        }
+
+
+        if(gumba!=nullptr && gumbaBoss == nullptr && !(gumba->hasCollided_)) //if other object is a Gumba, kill the Gumba and add score and destroy the fireball
         {
             gumba->destroyLater();