Changeset 4927 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/test_gun.cc

Timestamp:

Jul 21, 2005, 5:33:20 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some smaller fixes, to make Weapon more local

File:

• orxonox/trunk/src/world_entities/weapons/test_gun.cc (modified) (4 diffs)

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -64 +64 @@
   if( this->leftRight == W_LEFT)
     {
-      this->projectileOffset = Vector(1.0, 0.0, -0.35);
+      this->setEmissionPoint(1.0, 0.0, -0.35);
 
       animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
@@ -78 +78 @@
   else if( this->leftRight == W_RIGHT)
     {
-      this->projectileOffset = Vector(1.0, 0.0, 0.5);
+      this->setEmissionPoint(1.0, 0.0, 0.5);
 
       this->objectComponent1->setRelCoor(Vector(0,0,0.35));
@@ -105 +105 @@
   this->setStateDuration(WS_DEACTIVATING, .4);
 
-  this->energy = 100;
-  this->minCharge = 2;
+  this->increaseEnergy(100);
+  //this->minCharge = 2;
 
   this->setActionSound(WA_SHOOT, "sound/shot1.wav");
@@ -156 +156 @@
 //  weaponSource->play();
 
-  pj->setAbsCoor(this->getAbsCoor() + this->projectileOffset);
+  pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());
   pj->setVelocity(this->getVelocity());