Changeset 8533 for code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.h

Timestamp:

May 23, 2011, 2:26:25 PM (14 years ago)

Author:

simonmie

Message:

SimpleRocket and Rocket are now BasicProjectiles - damage is working now correctly with these two. More spam messages removed.

File:

• code/branches/gameimmersion/src/modules/weapons/projectiles/Rocket.h (modified) (4 diffs)

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

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