Changeset 6439 in orxonox.OLD for trunk/src

Timestamp:

Jan 8, 2006, 2:45:23 PM (18 years ago)

Author:

bensch

Message:

trunk: WeaponSystem working again:
reverted the changed from revision 6435, because they made the WeaponSystem unusable

Location:

trunk/src/world_entities

Files:

• npcs/ground_turret.cc (modified) (1 diff)
• weapons/aiming_turret.cc (modified) (1 diff)
• weapons/targeting_turret.cc (modified) (1 diff)
• weapons/turret.cc (modified) (1 diff)
• weapons/weapon.cc (modified) (2 diffs)
• weapons/weapon.h (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (1 diff)

trunk/src/world_entities/npcs/ground_turret.cc

@@ -115 +115 @@
   if (likely(this->left != NULL))
   {
-    this->left->tick(dt);
+    this->left->tickW(dt);
     this->left->requestAction(WA_SHOOT);
   }
   if (likely(this->right != NULL))
   {
-    this->right->tick(dt);
+    this->right->tickW(dt);
     this->right->requestAction(WA_SHOOT);
   }

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -118 +118 @@
 void AimingTurret::tick(float dt)
 {
-  Weapon::tick(dt);
-
   Quaternion quat;
   Vector direction = this->target->getAbsCoor() - this->getAbsCoor();

trunk/src/world_entities/weapons/targeting_turret.cc

@@ -119 +119 @@
 void TargetingTurret::tick(float dt)
 {
-  Weapon::tick(dt);
 
   this->target->tick(dt);

trunk/src/world_entities/weapons/turret.cc

@@ -114 +114 @@
 void Turret::tick(float dt)
 {
-  Weapon::tick(dt);
   Quaternion quat;
   Vector direction = this->getAbsCoor();/*this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();*/

trunk/src/world_entities/weapons/weapon.cc

@@ -552 +552 @@
  * tick signal for time dependent/driven stuff
 */
-void Weapon::tick(float dt)
+void Weapon::tickW(float dt)
 {
   //printf("%s ", stateToChar(this->currentState));
@@ -575 +575 @@
     }
   }
+  tick(dt);
 }
 

trunk/src/world_entities/weapons/weapon.h

@@ -153 +153 @@
 
     // FLOW
-    void tick(float dt); //!< this is a function that must be called by the weaponManager, or any other weaponHandler, all other functions are handled from within
+    void tickW(float dt); //!< this is a function that must be called by the weaponManager, or any other weaponHandler, all other functions are handled from within
+
+    virtual void tick(float dt) {};
 
     bool check() const;

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -389 +389 @@
 
     if( tickWeapon != NULL && tickWeapon->isActive())
-      tickWeapon->tick(dt);
+      tickWeapon->tickW(dt);
   }