Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 28, 2009, 2:41:15 AM (16 years ago)
Author:
landauf
Message:

merged revision 3090 from map branch back to trunk

Location:
code/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • code/trunk/src/orxonox/objects/RadarViewable.cc

    r3089 r3101  
    7272    RadarViewable::~RadarViewable()
    7373    {
     74        if (this->isHumanShip_ && MapNode_)
     75            MapNode_->removeAllChildren();
     76
    7477        if (MapNode_)
    7578            delete MapNode_;
    76         MapNode_=0;
    7779
    7880        if (MapEntity_)
    7981            delete MapEntity_;
    80         MapEntity_=0;
    8182
    8283        if (line_)
    8384            delete line_;
    84         line_=0;
    8585
    8686        if (LineNode_)
    8787            delete LineNode_;
    88         LineNode_=0;
    8988    }
    9089

  • code/trunk/src/orxonox/objects/RadarViewable.h

    r3089 r3101  
    114114            return this->uniqueId_;
    115115        }
     116        //friend class Map;
    116117
    117118    private:

  • code/trunk/src/orxonox/objects/worldentities/CMakeLists.txt

    r3087 r3101  
    1010  Billboard.cc
    1111  BlinkingBillboard.cc
    12   BigExplosion.cc       
     12  BigExplosion.cc
    1313  ExplosionChunk.cc
    1414  FadingBillboard.cc
Note: See TracChangeset for help on using the changeset viewer.