Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10558


Ignore:
Timestamp:
Aug 29, 2015, 6:45:20 PM (5 years ago)
Author:
landauf
Message:

no need to call get() on Weak or StrongPtr. they are automatically converted to normal pointers.

Location:
code/branches/core7/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core7/src/modules/objects/SpaceBoundaries.cc

    r9941 r10558  
    210210        for( std::list<WeakPtr<Pawn> >::iterator current = pawnsIn_.begin(); current != pawnsIn_.end(); current++ )
    211211        {
    212             Pawn* currentPawn = current->get();
     212            Pawn* currentPawn = *current;
    213213            if( currentPawn && currentPawn->getNode() )
    214214            {
  • code/branches/core7/src/modules/objects/triggers/DistanceTrigger.cc

    r10557 r10558  
    147147    {
    148148        // Check whether there is a cached object, it still exists and whether it is still in range, if so nothing further needs to be done.
    149         if(this->cache_.get() != NULL)
    150         {
    151             if((this->cache_.get()->getWorldPosition() - this->getWorldPosition()).length() < this->distance_)
     149        if(this->cache_ != NULL)
     150        {
     151            if((this->cache_->getWorldPosition() - this->getWorldPosition()).length() < this->distance_)
    152152                return true;
    153153            else
  • code/branches/core7/src/orxonox/interfaces/PlayerTrigger.h

    r9667 r10558  
    6363        */
    6464        inline Pawn* getTriggeringPawn(void) const
    65             { return this->pawn_.get(); }
     65            { return this->pawn_; }
    6666
    6767        /**
  • code/branches/core7/src/orxonox/overlays/OverlayGroup.cc

    r10555 r10558  
    135135            for (unsigned int i = 0; i != index; ++it, ++i)
    136136                ;
    137             return it->get();
     137            return *it;
    138138        }
    139139        else
  • code/branches/core7/src/orxonox/worldentities/ControllableEntity.cc

    r10555 r10558  
    215215            {
    216216                this->cameraPositions_.front()->attachCamera(this->camera_);
    217                 this->currentCameraPosition_ = this->cameraPositions_.front().get();
     217                this->currentCameraPosition_ = this->cameraPositions_.front();
    218218            }
    219219            else if (this->cameraPositions_.size() > 0)
  • code/branches/core7/src/orxonox/worldentities/ControllableEntity.h

    r10555 r10558  
    155155
    156156            inline Controller* getController() const
    157                 { return this->controller_.get(); }
     157                { return this->controller_; }
    158158            void setController(Controller* val);
    159159
     
    161161            virtual void setTarget( WorldEntity* target );
    162162            virtual WorldEntity* getTarget()
    163                 { return this->target_.get(); }
     163                { return this->target_; }
    164164            void setTargetInternal( uint32_t targetID );
    165165
Note: See TracChangeset for help on using the changeset viewer.