Changeset 11625
- Timestamp:
- Dec 4, 2017, 2:45:06 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc
r11601 r11625 39 39 #include "SOBFigure.h" 40 40 #include "SOBGumba.h" 41 #include "SOBGumbaBoss.h" 41 42 #include "SOB.h" 42 43 #include "util/Output.h" … … 106 107 collDisZ_ = getPosition().z - contactPoint.getPositionWorldOnB().getZ(); 107 108 108 SOBGumba* gumba = orxonox_cast<SOBGumba*>(otherObject); 109 110 111 if(gumba!=nullptr && !(gumba->hasCollided_)) //if other object is a Gumba, kill the Gumba and add score and destroy the fireball 109 SOBGumba* gumba = orxonox_cast<SOBGumba*> (otherObject); 110 SOBGumbaBoss* gumbaBoss = orxonox_cast<SOBGumbaBoss*> (otherObject); 111 112 if(gumbaBoss != nullptr && !(gumba->hasCollided_)) 113 { 114 this->destroyLater(); 115 this->hasCollided_ = true; 116 } 117 118 119 if(gumba!=nullptr && gumbaBoss == nullptr && !(gumba->hasCollided_)) //if other object is a Gumba, kill the Gumba and add score and destroy the fireball 112 120 { 113 121 gumba->destroyLater();
Note: See TracChangeset
for help on using the changeset viewer.