Changeset 1306 for code/branches/merge/src/orxonox
- Timestamp:
- May 15, 2008, 11:33:46 PM (17 years ago)
- Location:
- code/branches/merge/src/orxonox/objects
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/merge/src/orxonox/objects/Projectile.cc
r1263 r1306 63 63 64 64 this->destroyTimer_.setTimer(this->lifetime_, false, this, createExecutor(createFunctor(&Projectile::destroyObject))); 65 this->classID = this->getIdentifier()->getNetworkID(); // TODO: remove this hack 66 // COUT(3) << this->classID << std::endl; 65 67 } 66 68 -
code/branches/merge/src/orxonox/objects/SpaceShip.cc
r1299 r1306 456 456 if (this->bLMousePressed_ && this->timeToReload_ <= 0) 457 457 { 458 458 459 Projectile *p = new Projectile(this); 460 459 461 p->setBacksync(true); 460 462 this->timeToReload_ = this->reloadTime_;
Note: See TracChangeset
for help on using the changeset viewer.