Changeset 8855 for code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc

Timestamp:

Aug 22, 2011, 3:05:26 PM (13 years ago)

Author:

dafrick

Message:

Cleaning up game immersion. Roughly documenting weapons module.

File:

• code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc (modified) (3 diffs)

code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc

@@ -27 +27 @@
  */
 
+/**
+    @file LaserFire.h
+    @brief Implementation of the LaserFire class.
+*/
+
 #include "LaserFire.h"
 
 #include "core/CoreIncludes.h"
-#include "weapons/projectiles/ParticleProjectile.h"
+
 #include "weaponsystem/Weapon.h"
 #include "weaponsystem/WeaponPack.h"
 #include "weaponsystem/WeaponSystem.h"
 #include "worldentities/pawns/Pawn.h"
+
+#include "weapons/projectiles/ParticleProjectile.h"
 
 namespace orxonox
@@ -44 +51 @@
         RegisterObject(LaserFire);
 
-        this->reloadTime_ = 0.25;
-        this->damage_ = 0; //default 15
-        this->speed_ = 1250;
+        this->reloadTime_ = 0.25f;
+        this->damage_ = 0.0f;
+        this->speed_ = 1250.0f;
 
         this->setMunitionName("LaserMunition");
     }
 
-    /* Creates the projectile object, sets its properties to the LaserFire properties
-     */
+    /**
+    @brief
+        Fires the weapon. Creates a projectile and fires it.
+    */
     void LaserFire::fire()
     {
@@ -61 +70 @@
         projectile->setVelocity(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getVelocity() + this->getMuzzleDirection() * this->speed_);
 
-        projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+        projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         projectile->setDamage(this->getDamage());
         projectile->setShieldDamage(this->getShieldDamage());