Changeset 6153 for code/branches/presentation2/src/modules

Timestamp:

Nov 25, 2009, 6:04:10 PM (14 years ago)

Author:

scheusso

Message:

some fixes in weapon system / weapons
fabian: projectiles also spawn on wrong position in standalone mode

Location:

code/branches/presentation2/src/modules/weapons/weaponmodes

Files:

• LightningGun.cc (modified) (1 diff)
• RocketFire.cc (modified) (2 diffs)

code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc

@@ -59 +59 @@
         projectile->setMaterial("Flares/LightningBall_");
 
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());

code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -36 +36 @@
 #include "weaponsystem/WeaponPack.h"
 #include "weaponsystem/WeaponSystem.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -57 +58 @@
         Rocket* rocket = new Rocket(this);
 
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         rocket->setOrientation(this->getMuzzleOrientation());
         rocket->setPosition(this->getMuzzlePosition());