Changeset 8579 for code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.h

Timestamp:

May 25, 2011, 9:28:29 PM (13 years ago)

Author:

dafrick

Message:

Reverse merge to revert last, failed, merge. Apparently you can't partially commit a merge.

File:

• code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.h (modified) (5 diffs)

code/branches/presentation/src/modules/weapons/projectiles/SimpleRocket.h

@@ -23 +23 @@
  *      Oliver Scheuss
  *   Co-authors:
- *      simonmie
+ *      ...
  *
  */
@@ -36 +36 @@
 #include "graphics/ParticleSpawner.h"
 
-#include "BasicProjectile.h"
-
 namespace orxonox
 {
@@ -48 +46 @@
        Gabriel Nadler (Original file: Oli Scheuss)
     */
-    class _WeaponsExport SimpleRocket : public ControllableEntity, public BasicProjectile
+    class _WeaponsExport SimpleRocket : public ControllableEntity
     {
         public:
@@ -113 +111 @@
             inline Pawn* getOwner() const
                 { return this->owner_; }
-
             inline bool hasFuel() const
             { return this->fuel_; }
+
+            inline void setDamage(float damage)
+                { this->damage_ = damage; }
+            inline float getDamage() const
+                { return this->damage_; }
 
 
@@ -121 +123 @@
             WeakPtr<Pawn> owner_;
             Vector3 localAngularVelocity_;
+            float damage_;
+            bool bDestroy_;
             bool fuel_; //!< Bool is true while the rocket "has fuel"