Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jan 30, 2006, 9:39:58 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: small fixes (cleanup)

Location:
trunk/src/world_entities/space_ships
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/space_ships/helicopter.cc

    r6805 r6871  
    213213}
    214214
    215 void  Helicopter::attachCamera()
    216 {
     215void Helicopter::enter()
     216{
     217  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
    217218  State::getCamera()->setParentSoft(this->getWeaponManager()->getFixedTarget());
    218219  State::getCameraTarget()->setParentSoft(this->getWeaponManager()->getFixedTarget());
    219 
    220 }
    221 
    222 
    223 void Helicopter::enter()
    224 {
    225   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
    226   this->attachCamera();
    227 
    228 
    229220}
    230221
  • trunk/src/world_entities/space_ships/helicopter.h

    r6805 r6871  
    2525    virtual void enter();
    2626    virtual void leave();
    27     virtual void attachCamera();
    2827
    2928    virtual void postSpawn();
  • trunk/src/world_entities/space_ships/hover.cc

    r6824 r6871  
    3939 */
    4040Hover::~Hover ()
    41 {}
     41{
     42
     43}
    4244
    4345/**
     
    185187}
    186188
    187 void  Hover::attachCamera()
    188 {
     189
     190void Hover::enter()
     191{
     192  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
     193
    189194  State::getCamera()->setParentSoft(&this->cameraNode);
    190195  State::getCamera()->setRelCoorSoft(-10, 0,0);
    191196  State::getCameraTarget()->setParentSoft(&this->cameraNode);
    192 }
    193 
    194 
    195 void Hover::enter()
    196 {
    197   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
    198   this->attachCamera();
    199 
    200 
    201197}
    202198
  • trunk/src/world_entities/space_ships/hover.h

    r6807 r6871  
    2222    virtual void enter();
    2323    virtual void leave();
    24     virtual void attachCamera();
    2524
    2625    virtual void postSpawn();
Note: See TracChangeset for help on using the changeset viewer.