Changeset 9016 for code/trunk/src/modules/weapons/projectiles/Rocket.cc
- Timestamp:
- Feb 15, 2012, 11:51:58 PM (12 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/modules/weapons/projectiles/Rocket.cc
r8891 r9016 66 66 this->localAngularVelocity_ = 0; 67 67 this->lifetime_ = 100.0f; 68 this->bIsRocket_= true;69 68 70 69 if (GameMode::isMaster()) … … 135 134 if(this->isInitialized()) 136 135 { 137 this->bIsRocket_= false;138 136 if (GameMode::isMaster()) 139 137 { … … 163 161 164 162 this->player_ = this->getShooter()->getPlayer(); 165 this->getShooter()->getPlayer()->startTemporaryControl(this); 163 if(this->player_) 164 this->player_->startTemporaryControl(this); 166 165 167 166 if( GameMode::isMaster() )
Note: See TracChangeset
for help on using the changeset viewer.