Changeset 12400 for code/branches/OrxoBlox_FS19/src/modules

Timestamp:

May 20, 2019, 2:26:49 PM (5 years ago)

Author:

jeromela

Message:

Changed counter

Location:

code/branches/OrxoBlox_FS19/src/modules

Files:

• OrxoBlox/OrxoBlox.h (modified) (1 diff)
• OrxoBlox/OrxoBloxWall.cc (modified) (1 diff)
• weapons/projectiles/BallProjectile.cc (modified) (2 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h

@@ -71 +71 @@
             WeakPtr<OrxoBloxWall> futureWall_;
             int counter;
-            const int max_counter = 4;
+            const int max_counter = 5;
 
     };

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc

@@ -43 +43 @@
                 float x_=(this->center_->getFieldDimension()).x;
                 float y_=(this->center_->getFieldDimension()).y;
-                stone->setPosition(size_*i -x_/2 +4.5f, -3.5f, -y_/2 + 6.5f);
+                stone->setPosition(size_*i -x_/2 +4.5f, -3.5f, -y_/2 - 2.25f);
 
 

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

@@ -28 +28 @@
         this->setCollisionShapeRadius(2.5);
         this->setDamage(1000);
-
+        orxoblox_->count();
         //setEffect("Orxonox/sparks2");
     }
@@ -146 +146 @@
                 position.z = this-> fieldHeight_;
                 
-                orxoblox_->count();
                 suicidal = true;