Changeset 3053 for code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc

Timestamp:

May 25, 2009, 4:19:14 AM (15 years ago)

Author:

landauf

Message:

merged weapons branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/weaponsystem (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem)
• src/orxonox/objects/weaponsystem/weaponmodes (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes)
• src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc (copied) (copied from code/branches/weapons/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc) (2 diffs, 1 prop)

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc

@@ -52 +52 @@
         this->speed_ = 2500;
         this->delay_ = 0;
-        this->setMunitionName("HsW01");
+        this->setMunitionName("LaserMunition");
 
         this->delayTimer_.setTimer(1.0f, false, this, createExecutor(createFunctor(&HsW01::shot)));
@@ -104 +104 @@
     {
         Projectile* projectile = new Projectile(this);
-        Model* model = new Model(projectile);
-        model->setMeshSource("laserbeam.mesh");
-        model->setCastShadows(false);
-        projectile->attach(model);
-        model->setScale(5);
+        Model* model = new Model(projectile);
+        model->setMeshSource("laserbeam.mesh");
+        model->setCastShadows(false);
+        projectile->attach(model);
+        model->setScale(5);
 
         projectile->setOrientation(this->getMuzzleOrientation());