Changeset 8855 for code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.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/SimpleRocketFire.cc (modified) (5 diffs)

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

@@ -21 +21 @@
  *
  *   Author:
+ *      Gabriel Nadler
+ *   Co-authors:
  *      Oliver Scheuss
- *   Co-authors:
  *      simonmie
  *
  */
 
+/**
+    @file BasicProjectile.h
+    @brief Implementation of the BasicProjectile class.
+*/
+
 #include "SimpleRocketFire.h"
 
+#include "core/CoreIncludes.h"
 #include "util/Math.h"
-#include "core/CoreIncludes.h"
-#include "weapons/RocketController.h"
 
 #include "weaponsystem/Weapon.h"
@@ -38 +43 @@
 #include "worldentities/pawns/Pawn.h"
 #include "sound/WorldSound.h"
+
+#include "weapons/RocketController.h"
+#include "weapons/projectiles/SimpleRocket.h"
 
 namespace orxonox
@@ -48 +56 @@
         RegisterObject(SimpleRocketFire);
 
-        this->reloadTime_ = 1;
+        this->reloadTime_ = 1.0f;
         this->bParallelReload_ = false;
-        this->damage_ = 0;
-        this->speed_ = 500;
+        this->damage_ = 0.0f;
+        this->speed_ = 500.0f;
 
         this->setMunitionName("RocketMunition");
@@ -62 +70 @@
     }
 
-    /* Creates the Rocket (RocketController) object, sets its properties to the SimpleRocketFire properties, sets target
-     */
+    /**
+    @brief
+        Fires the weapon. Creates the SimpleRocket and a RocketController to steer it and fires it.
+    */
     void SimpleRocketFire::fire()
     {
-        RocketController* con = new RocketController(this);
-        SimpleRocket* rocket = con->getRocket();
+        RocketController* controller = new RocketController(this);
+        SimpleRocket* rocket = controller->getRocket();
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         rocket->setOrientation(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getWorldOrientation());
         rocket->setPosition(this->getMuzzlePosition());
         rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
-        rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+        rocket->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
 
         rocket->setDamage(this->damage_);
@@ -78 +88 @@
         rocket->setHealthDamage(this->getHealthDamage());
 
-        WorldEntity* pawnn=static_cast<ControllableEntity*>(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn())->getTarget();
-        if (pawnn) con->setTarget(pawnn);
+        WorldEntity* pawn = static_cast<ControllableEntity*>(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn())->getTarget();
+        if (pawn) controller->setTarget(pawn);
     }
 }