Changeset 4878 in orxonox.OLD for orxonox/branches/weaponSystem/src/world_entities/weapons/test_gun.cc

Timestamp:

Jul 17, 2005, 12:37:18 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/weaponSystem: some definitions of the Weapon

File:

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

orxonox/branches/weaponSystem/src/world_entities/weapons/test_gun.cc

@@ -50 +50 @@
 
   this->model = (Model*)ResourceManager::getInstance()->load("models/test_gun.obj", OBJ, RP_CAMPAIGN);
-  this->idleTime = 0.2f;
   this->leftRight = leftRight;
 
@@ -145 +144 @@
 void TestGun::fire()
 {
-  if( !this->hasWeaponIdleTimeElapsed())
+  if( !this->stateTimeElapsed())
     {
       this->weaponIdle();
@@ -158 +157 @@
   pj->setVelocity(this->getVelocity());
   State::getWorldEntityList()->add(pj);
-  this->localTime = 0;
 
   this->animation1->replay();
@@ -191 +189 @@
 void TestGun::tick (float time)
 {
-  this->localTime += time;
+  this->stateTime += time;
 }