Changeset 6222 in orxonox.OLD for trunk/src/world_entities/space_ships/helicopter.cc

Timestamp:

Dec 21, 2005, 1:49:06 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/world_entities/space_ships/helicopter.cc (modified) (3 diffs)

trunk/src/world_entities/space_ships/helicopter.cc

@@ -95 +95 @@
 
   this->getWeaponManager()->changeWeaponConfig(1);
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
 }
 
@@ -184 +185 @@
 
 
+
+
+void Helicopter::enter()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+
+
+}
+
+void Helicopter::leave()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+
+
+}
+
+
 /**
  * adds a weapon to the weapon list of the spaceship
@@ -324 +342 @@
          if(this->getAbsDirZ().y > 0.02) this->shiftDir(Quaternion(time/5, Vector(1,0,0)));
    }
-   
+
   if( this->bRight /* > this->getRelCoor().z*2*/)
   {