Changeset 9518 in orxonox.OLD for branches/proxy/src/world_entities/weapons

Timestamp:

Jul 27, 2006, 6:58:04 PM (18 years ago)

Author:

bensch

Message:

targetting turrets are firing all the time now, but the hack is out :/

Location:

branches/proxy/src/world_entities/weapons

Files:

• aim.cc (modified) (3 diffs)
• targeting_turret.h (modified) (1 diff)

branches/proxy/src/world_entities/weapons/aim.cc

@@ -71 +71 @@
   this->range = 10000;
   this->angle = M_PI_4;
-  this->targetGroup = OM_GROUP_02_PROJ;
+  this->targetGroup = OM_GROUP_01;
   this->anim = new tAnimation<Aim>(this, &Aim::setSize);
   this->anim->setInfinity(ANIM_INF_CONSTANT);
@@ -132 +132 @@
 void Aim::setTargetGroupS(const std::string& groupName)
 {
-  printf("::::::::::::::::::::::: TEST\n");
   OM_LIST id = ObjectManager::StringToOMList(groupName);
   if (id != OM_NULL)
@@ -138 +137 @@
   else
     PRINTF(2)("List %s not found for targetting\n", groupName.c_str());
-
-  printf("targetGroup: %s, %d", groupName.c_str(), id);
 }
 

branches/proxy/src/world_entities/weapons/targeting_turret.h

@@ -26 +26 @@
   virtual void draw() const;
 
+  const PNode* getLockedTarget() const { return lockedTarget; };
+
 private:
   void init();