Changeset 8579 for code/branches/presentation/src/modules/weapons/projectiles/Rocket.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/Rocket.h (modified) (5 diffs)

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

@@ -23 +23 @@
  *      Oliver Scheuss
  *   Co-authors:
- *      simonmie
+ *      ...
  *
  */
@@ -34 +34 @@
 #include "tools/Timer.h"
 #include "worldentities/ControllableEntity.h"
-
-#include "BasicProjectile.h"
 
 namespace orxonox
@@ -48 +46 @@
         Oli Scheuss
     */
-    class _WeaponsExport Rocket : public ControllableEntity, public BasicProjectile
+    class _WeaponsExport Rocket : public ControllableEntity
     {
         public:
@@ -111 +109 @@
                 { return this->owner_; }
 
+            inline void setDamage(float damage)
+                { this->damage_ = damage; }
+            inline float getDamage() const
+                { return this->damage_; }
             virtual void fired(unsigned int firemode);
 
@@ -116 +118 @@
             WeakPtr<Pawn> owner_;
             Vector3 localAngularVelocity_;
+            float damage_;
+            bool bDestroy_;
 
             WeakPtr<PlayerInfo> player_;