[Orxonox-commit 7809] r12401 - code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles
jeromela at orxonox.net
jeromela at orxonox.net
Mon May 20 15:07:58 CEST 2019
Author: jeromela
Date: 2019-05-20 15:07:57 +0200 (Mon, 20 May 2019)
New Revision: 12401
Modified:
code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc
Log:
fixed count function (reverted changes)
Modified: code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc 2019-05-20 12:26:49 UTC (rev 12400)
+++ code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc 2019-05-20 13:07:57 UTC (rev 12401)
@@ -27,8 +27,7 @@
this->orxoblox_ = this->getOrxoBlox();
this->setCollisionShapeRadius(2.5);
this->setDamage(1000);
- orxoblox_->count();
- //setEffect("Orxonox/sparks2");
+ //setEffect("Orxonox/sparks2");
}
void BallProjectile::registerVariables()
@@ -144,7 +143,8 @@
if (position.z > this->fieldHeight_){
// Set the ball to be exactly at the boundary.
position.z = this-> fieldHeight_;
-
+ orxoblox_->count();
+
suicidal = true;
}
More information about the Orxonox-commit
mailing list