Changeset 6637 in orxonox.OLD for trunk/src/world_entities/weapons/aiming_turret.cc

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/aiming_turret.cc (modified) (2 diffs)

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -98 +98 @@
   this->target = new Aim(this);
   this->target->setVisibility(false);
+  this->target->setRange(100);
+  this->target->setAngle(M_PI);
 }
 
@@ -146 +148 @@
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
-  this->target->searchTarget(100);
+  this->target->searchTarget();
 }