Changeset 1562 for code/trunk/src/orxonox/objects/SpaceShip.cc
- Timestamp:
- Jun 7, 2008, 3:39:48 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/objects/SpaceShip.cc
r1559 r1562 151 151 delete this->cam_; 152 152 153 if (! myShip_ && &HUD::getSingleton()!=NULL)154 HUD::getSingleton().removeRadarObject(this->getNode());153 if (!this->myShip_) 154 HUD::getSingleton().removeRadarObject(this->getNode()); 155 155 } 156 156 } … … 161 161 myShip_=true; 162 162 else 163 HUD::getSingleton().addRadarObject(this->getNode(), 3);163 HUD::getSingleton().addRadarObject(this->getNode(), this->getProjectileColour()); 164 164 } 165 165 if(Model::create()) … … 282 282 void SpaceShip::setCamera(const std::string& camera) 283 283 { 284 myShip_=true; // TODO: this is only a hack 284 285 camName_=camera; 285 286 // change camera attributes here, if you want to ;) … … 353 354 XMLPortParamLoadOnly(SpaceShip, "transDamp", setTransDamp, xmlelement, mode); 354 355 XMLPortParamLoadOnly(SpaceShip, "rotDamp", setRotDamp, xmlelement, mode); 355 myShip_=true; // TODO: this is only a hack356 356 357 357 SpaceShip::create();
Note: See TracChangeset
for help on using the changeset viewer.