- Timestamp:
- Dec 17, 2008, 2:10:11 AM (15 years ago)
- Location:
- code/branches/presentation
- Files:
-
- 1 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation
- Property svn:mergeinfo changed
/code/branches/weapon2 (added) merged: 2108,2145,2186,2203,2232,2272-2273,2288,2308,2319,2327,2331,2337,2347,2354,2366-2368,2379,2391,2393,2398,2410
- Property svn:mergeinfo changed
-
code/branches/presentation/src/orxonox/objects/weaponSystem/weapons/Fusion.cc
r2489 r2493 44 44 { 45 45 RegisterObject(Fusion); 46 46 47 47 this->speed_ = 1250; 48 48 … … 55 55 void Fusion::takeBullets() 56 56 { 57 COUT(0) << "Fusion::takeBullets" << std::endl;57 //COUT(0) << "Fusion::takeBullets" << std::endl; 58 58 this->munition_->removeBullets(1); 59 59 this->bulletTimer(this->bulletLoadingTime_); … … 68 68 void Fusion::createProjectile() 69 69 { 70 COUT(0) << "Fusion::createProjectile" << std::endl;70 //COUT(0) << "Fusion::createProjectile" << std::endl; 71 71 BillboardProjectile* projectile = new ParticleProjectile(this); 72 72 projectile->setOrientation(this->getWorldOrientation()); 73 73 projectile->setPosition(this->getWorldPosition()); 74 projectile->setVelocity( WorldEntity::FRONT * this->speed_);74 projectile->setVelocity(this->getWorldOrientation() * WorldEntity::FRONT * this->speed_); 75 75 } 76 76 }
Note: See TracChangeset
for help on using the changeset viewer.