- Timestamp:
- Oct 4, 2015, 12:11:03 PM (9 years ago)
- Location:
- code/branches/presentationFS15merge
- Files:
-
- 4 edited
-
. (modified) (1 prop)
-
src/modules/weapons/weaponmodes/EnergyDrink.cc (modified) (1 diff)
-
src/modules/weapons/weaponmodes/FusionFire.cc (modified) (1 diff)
-
src/modules/weapons/weaponmodes/LaserFire.cc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationFS15merge
- Property svn:mergeinfo changed
/code/branches/clangenb (added) merged: 10385,10494-10495,10596-10597
- Property svn:mergeinfo changed
-
code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/EnergyDrink.cc
r10296 r10610 108 108 model->setScale(5); 109 109 110 this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition()); 110 111 projectile->setOrientation(this->getMuzzleOrientation()); 111 112 projectile->setPosition(this->getMuzzlePosition()); -
code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/FusionFire.cc
r10296 r10610 68 68 BillboardProjectile* projectile = new BillboardProjectile(this->getContext()); 69 69 70 this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition()); 70 71 projectile->setOrientation(this->getMuzzleOrientation()); 71 72 projectile->setPosition(this->getMuzzlePosition()); -
code/branches/presentationFS15merge/src/modules/weapons/weaponmodes/LaserFire.cc
r10296 r10610 66 66 ParticleProjectile* projectile = new ParticleProjectile(this->getContext()); 67 67 68 this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition()); 68 69 projectile->setOrientation(this->getMuzzleOrientation()); 69 70 projectile->setPosition(this->getMuzzlePosition());
Note: See TracChangeset
for help on using the changeset viewer.
