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

Timestamp:

Apr 18, 2005, 8:05:00 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: weapon change enhanced. weapon handling is now better and safer

File:

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

orxonox/trunk/src/world_entities/test_gun.cc

@@ -40 +40 @@
    creates a new weapon
 */
-TestGun::TestGun (PNode* parent, Vector* coordinate, Quaternion* direction, int leftRight) 
+TestGun::TestGun (PNode* parent, const Vector& coordinate, const Quaternion& direction, int leftRight) 
   :  Weapon (parent, coordinate, direction) 
 {
@@ -127 +127 @@
 void TestGun::fire()
 {
-  if( this->localTime < this->idleTime)
+  if( !this->hasWeaponIdleTimeElapsed())
     {
       this->weaponIdle();
@@ -201 +201 @@
                     this->getAbsCoor ().y, 
                     this->getAbsCoor ().z);
-      
+
       this->getAbsDir ().matrix (matrix);
       glMultMatrixf((float*)matrix);
@@ -228 +228 @@
                 this->dummy1->getAbsCoor ().y, 
                 this->dummy1->getAbsCoor ().z);
-
+  
   this->dummy1->getAbsDir ().matrix (matrix);
   glMultMatrixf((float*)matrix);