Changeset 6738 in orxonox.OLD

Timestamp:

Jan 25, 2006, 9:30:43 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: tick also in the turrets now

Location:

trunk/src/world_entities/weapons

Files:

• aiming_turret.cc (modified) (1 diff)
• targeting_turret.cc (modified) (2 diffs)
• turret.cc (modified) (1 diff)

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -120 +120 @@
 void AimingTurret::tick(float dt)
 {
+  if (!Weapon::tickW(dt))
+    return;
   Quaternion quat;
   Vector direction = this->target->getAbsCoor() - this->getAbsCoor();

trunk/src/world_entities/weapons/targeting_turret.cc

@@ -124 +124 @@
 void TargetingTurret::tick(float dt)
 {
+  if (!Weapon::tickW(dt))
+    return;
+
   if( lockedTime >= neededLockTime )
    {
@@ -153 +156 @@
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
-  
+
 }
 

trunk/src/world_entities/weapons/turret.cc

@@ -116 +116 @@
 void Turret::tick(float dt)
 {
+  if (!Weapon::tickW(dt))
+    return;
 
   Quaternion quat;