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

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/weapons/targeting_turret.h (modified) (3 diffs)

trunk/src/world_entities/weapons/targeting_turret.h

@@ -12 +12 @@
 class TargetingTurret : public Weapon
 {
+  ObjectListDeclaration(TargetingTurret);
 public:
   TargetingTurret(const TiXmlElement* root = NULL);
@@ -26 +27 @@
   virtual void draw() const;
 
-  void setTargetGroup(OM_LIST targetGroup) { this->target.setTargetGroup(targetGroup); };
+  void setTargetGroup(OM_LIST targetGroup) { this->target->setTargetGroup(targetGroup); };
   const PNode* getLockedTarget() const { return lockedTarget; };
 
@@ -33 +34 @@
 
 private:
-  Aim            target;
+  Aim*           target;
   PNode*         lockedTarget;
   float          lockedTime;