Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 11, 2009, 5:39:53 PM (15 years ago)
Author:
wirthmi
Message:

First implementation of direction shooting.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/steering/src/orxonox/infos/PlayerInfo.cc

    r5993 r6045  
    138138        assert(this->controller_);
    139139        this->controller_->setPlayer(this);
    140         if (this->controllableEntity_)
     140        if (this->controllableEntity_) {
    141141            this->controller_->setControllableEntity(this->controllableEntity_);
     142            this->controllableEntity_->setController(this->controller_);
     143        }
    142144        this->changedController();
    143145    }
     
    158160        this->bReadyToSpawn_ &= (!this->bSetUnreadyAfterSpawn_);
    159161
    160         if (this->controller_)
     162        if (this->controller_) {
    161163            this->controller_->setControllableEntity(entity);
     164            this->controllableEntity_->setController(this->controller_);
     165        }
    162166
    163167        this->changedControllableEntity();
     
    171175            return;
    172176
     177        this->controllableEntity_->setController(0);
    173178        this->controllableEntity_ = 0;
    174179        this->controllableEntityID_ = OBJECTID_UNKNOWN;
Note: See TracChangeset for help on using the changeset viewer.