Changeset 6871 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Jan 30, 2006, 9:39:58 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: small fixes (cleanup)

Location:

trunk/src/world_entities/space_ships

Files:

• helicopter.cc (modified) (1 diff)
• helicopter.h (modified) (1 diff)
• hover.cc (modified) (2 diffs)
• hover.h (modified) (1 diff)

trunk/src/world_entities/space_ships/helicopter.cc

@@ -213 +213 @@
 }
 
-void  Helicopter::attachCamera()
-{
+void Helicopter::enter()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
   State::getCamera()->setParentSoft(this->getWeaponManager()->getFixedTarget());
   State::getCameraTarget()->setParentSoft(this->getWeaponManager()->getFixedTarget());
-
-}
-
-
-void Helicopter::enter()
-{
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
-  this->attachCamera();
-
-
 }
 

trunk/src/world_entities/space_ships/helicopter.h

@@ -25 +25 @@
     virtual void enter();
     virtual void leave();
-    virtual void attachCamera();
 
     virtual void postSpawn();

trunk/src/world_entities/space_ships/hover.cc

@@ -39 +39 @@
  */
 Hover::~Hover ()
-{}
+{
+
+}
 
 /**
@@ -185 +187 @@
 }
 
-void  Hover::attachCamera()
-{
+
+void Hover::enter()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+
   State::getCamera()->setParentSoft(&this->cameraNode);
   State::getCamera()->setRelCoorSoft(-10, 0,0);
   State::getCameraTarget()->setParentSoft(&this->cameraNode);
-}
-
-
-void Hover::enter()
-{
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
-  this->attachCamera();
-
-
 }
 

trunk/src/world_entities/space_ships/hover.h

@@ -22 +22 @@
     virtual void enter();
     virtual void leave();
-    virtual void attachCamera();
 
     virtual void postSpawn();