Changeset 6637 in orxonox.OLD for trunk/src/world_entities/weapons/targeting_turret.h

Timestamp:

Jan 21, 2006, 1:27:29 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the SpaceShipControl branche back to the trunk

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/spaceshipcontrol . -r6482:HEAD

minor conflicts, and added file hover.cc/h to the Makefile.

File:

• trunk/src/world_entities/weapons/targeting_turret.h (modified) (1 diff)

trunk/src/world_entities/weapons/targeting_turret.h

@@ -32 +32 @@
 
   private:
-    Aim*          target;
-  };
+    Aim*           target;
+    PNode*         lockedTarget;
+    float          lockedTime;
+    float          neededLockTime;
+  }; 
 
 #endif /* _TARGETING_TURRET_H */