Changeset 12388 for code/branches/OrxoBlox_FS19/src/modules/weapons

Timestamp:

May 16, 2019, 4:24:32 PM (6 years ago)

Author:

pomselj

Message:

Projectiles die with level up

File:

• code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc (modified) (3 diffs)

code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc

@@ -167 +167 @@
 
                // Get the current position, velocity and acceleration of the ball.
+        bool suicidal = false;
         Vector3 position = this->getPosition();
         Vector3 velocity = this->getVelocity();
@@ -185 +186 @@
                 
                 orxoblox_->LevelUp();
-
-
-                //this->setSpeed(0); // doesn't work here, why??;
-                //Stopping ball
-                //orxout() << "Ball stopped" << endl;
-                velocity.x = 0;
-                velocity.y = 0;
-                velocity.z = 0; 
-
-                //ChatManager::message("Waiting for your input");
-                //Input new speed here:
-                //ChatManager::message("Setting new speed");
+                suicidal = true;
                 
-                //%%%%%%%%%%%%
-                //MAUSPOSITION
-                //%%%%%%%%%%%%
-                //Reads current mouse position
-                //TODO: read Mouse position on click!
-                //int mousex = InputManager::getInstance().getMousePosition().first;
-                //int mousey = InputManager::getInstance().getMousePosition().second;
-                //ChatManager::message("Read mouse position");
-                //orxout() << "Mouseposition" << endl;
-                //orxout() << mousex << endl;
-                //ChatManager::message(mousex);
-                //ChatManager::message("mousey");
-                //ChatManager::message(mousey);
-                //Set new speed here!!
-                velocity.x = rnd(-100,100);
-                velocity.z = rnd(-50,-100);
-                
-
             }
             if (position.z < -this->fieldHeight_){
@@ -258 +230 @@
             this->setPosition(position);
         //this->Collides((this->orxoblox_->CheckForCollision(this)));
+        if (suicidal == true) {
+            this->destroy();
+        }
 
     }