Changeset 11597 for code/branches/SOBv2_HS17/src

Timestamp:

Nov 27, 2017, 2:21:11 PM (7 years ago)

Author:

varxth

Message:

Collisionshape of fireball

Location:

code/branches/SOBv2_HS17/src/modules/superorxobros

Files:

• SOBFigure.cc (modified) (1 diff)
• SOBFireball.cc (modified) (1 diff)
• SOBQBlock.cc (modified) (1 diff)

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

@@ -160 +160 @@
 
         else if (fireball != nullptr && !(fireball->hasCollided_)){
-            //this-> die();
+            PowerUpCounter_--;
+            this->changeClothes();
         }
 

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

@@ -165 +165 @@
             velocity.x = dir*speed_;
             velocity.y = 0;
-            if(hitCounter_ >= 3) velocity.y = 50;
+            if(hitCounter_ >= 3) velocity.y = 0.1*speed_;
             setVelocity(velocity);
 

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

@@ -65 +65 @@
         float v_z = otherObject->getVelocity().z;
         int collDisZ_ = getPosition().z - contactPoint.getPositionWorldOnB().getZ();
-        orxout() << "Distanz in z: " << collDisZ_ << endl;
         if (!used_ && v_z > 50.0 && collDisZ_ > 0) {
             used_ = true;