Changeset 6412 for code/branches/pickup2/src/modules/weapons/weaponmodes/HsW01.cc

Timestamp:

Dec 25, 2009, 1:18:03 PM (16 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/modules/weapons/weaponmodes/HsW01.cc (modified) (4 diffs)

code/branches/pickup2/src/modules/weapons/weaponmodes/HsW01.cc

@@ -39 +39 @@
 #include "weaponsystem/WeaponPack.h"
 #include "weaponsystem/WeaponSystem.h"
+#include "worldentities/WorldEntity.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -56 +58 @@
         this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&HsW01::shot, this)));
         this->delayTimer_.stopTimer();
+
+        this->setDefaultSound("sounds/Weapon_HsW01.ogg");
+    }
+
+    HsW01::~HsW01()
+    {
     }
 
@@ -103 +111 @@
     void HsW01::shot()
     {
+        assert( this->getWeapon() && this->getWeapon()->getWeaponPack() && this->getWeapon()->getWeaponPack()->getWeaponSystem() && this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn() );
         Projectile* projectile = new Projectile(this);
         Model* model = new Model(projectile);
@@ -110 +119 @@
         model->setScale(5);
 
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());