Changeset 11575 for code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFireball.cc

Timestamp:

Nov 20, 2017, 3:21:35 PM (6 years ago)

Author:

varxth

Message:

merged Fireball and player

File:

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

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

@@ -67 +67 @@
         collDisX_ = 0;
         collDisZ_ = 0;
-
-      orxout() << "fireball existed" << endl;
-
+        hitCounter_ = 0;
         
     }
@@ -90 +88 @@
         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
         {
@@ -99 +98 @@
             this->hasCollided_ = true;
         }
+
+
          //collision with either top or bottom of a block
         else if(changeAllowed_ && (abs(collDisX_)<=abs(collDisZ_)))
@@ -104 +105 @@
             changeAllowed_ = false;
             Vector3 velocity = getVelocity();
-            orxout() << "before:    velocity in z = " << velocity.z << endl;
             velocity.z = -velocity.z;
-            orxout() << "after:     velocity in z = " << velocity.z << endl;
+     
 
             setVelocity(velocity);
@@ -114 +114 @@
         else if(changeAllowed_ && (abs(collDisX_)>abs(collDisZ_))) 
         {
-            orxout() << "collision with the vertical side of a block " << endl;
-
             changeAllowed_ = false;
             goesRight_=!goesRight_;
         }
 
+        hitCounter_++;
         
         return true;
@@ -154 +153 @@
             velocity.x = dir*speed_;
             velocity.y = 0;
+            if(hitCounter_ >= 3) velocity.y = 50;
             setVelocity(velocity);
 
             lastPos_ = getPosition();
+
+            if(abs(this->getPosition().z) > 1000) delete this;
         
     }