Changeset 8533 for code/branches

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.

Location:

code/branches/gameimmersion/src

Files:

• modules/weapons/projectiles/Projectile.cc (modified) (1 diff)
• modules/weapons/projectiles/Rocket.cc (modified) (5 diffs)
• modules/weapons/projectiles/Rocket.h (modified) (4 diffs)
• modules/weapons/projectiles/SimpleRocket.cc (modified) (4 diffs)
• modules/weapons/projectiles/SimpleRocket.h (modified) (3 diffs)
• orxonox/weaponsystem/WeaponMode.h (modified) (2 diffs)
• orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/branches/gameimmersion/src/modules/weapons/projectiles/Projectile.cc

@@ -36 +36 @@
 #include "worldentities/pawns/Pawn.h"
 #include "graphics/ParticleSpawner.h"
-#include "BasicProjectile.h"
 
 namespace orxonox

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

@@ -43 +43 @@
 #include "Scene.h"
 
+#include "BasicProjectile.h"
+
 namespace orxonox
 {
@@ -52 +54 @@
         Constructor. Registers the object and initializes some default values.
     */
-    Rocket::Rocket(BaseObject* creator) : ControllableEntity(creator)
+    Rocket::Rocket(BaseObject* creator) : ControllableEntity(creator), BasicProjectile()
     {
         RegisterObject(Rocket);// - register the Rocket class to the core
 
         this->localAngularVelocity_ = 0;
-        this->bDestroy_ = false;
+//        this->bDestroy_ = false;
         this->lifetime_ = 100;
 
@@ -175 +177 @@
         if( GameMode::isMaster() )
         {
-            if( this->bDestroy_ )
+            if( this->getBDestroy() )
                 this->destroy();
 
@@ -183 +185 @@
     bool Rocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        if (!this->bDestroy_ && GameMode::isMaster())
+        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->owner_,this);
+
+/* * /        if (!this->bDestroy_ && GameMode::isMaster())
         {
             if (otherObject == this->owner_)
@@ -216 +220 @@
 //             this->destroy();
         }
-        return false;
+/ * */        return false;
     }
 

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_;

code/branches/gameimmersion/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -48 +48 @@
     CreateFactory(SimpleRocket);
 
-    SimpleRocket::SimpleRocket(BaseObject* creator) : ControllableEntity(creator)
+    SimpleRocket::SimpleRocket(BaseObject* creator) : ControllableEntity(creator), BasicProjectile()
     {
         RegisterObject(SimpleRocket);// - register the SimpleRocket class to the core
 
         this->localAngularVelocity_ = 0;
-        this->bDestroy_ = false;
+//        this->bDestroy_ = false;
         this->lifetime_ = 120;
 
@@ -115 +115 @@
                 this->disableFire();
 
-            if( this->bDestroy_ )
+            if( this->getBDestroy() )
                 this->destroy();
         }
@@ -167 +167 @@
     bool SimpleRocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        if (!this->bDestroy_ && GameMode::isMaster())
+        return BasicProjectile::basicCollidesAgainst(otherObject,contactPoint,this->owner_,this);
+/*        if (!this->bDestroy_ && GameMode::isMaster())
         {
             if (otherObject == this->owner_)
@@ -204 +205 @@
         }
         return false;
+*/
     }
 

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

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

code/branches/gameimmersion/src/orxonox/weaponsystem/WeaponMode.h

@@ -104 +104 @@
             // Fire
             inline void setDamage(float damage)
-                { this->damage_ = damage; COUT(3) << "DAMAGE-SET-FUNKTION (WeaponMode) WIRD AUFGERUFEN" << endl;}
+                { this->damage_ = damage;}
             inline float getDamage() const
                 { return this->damage_; }
@@ -115 +115 @@
 
             inline void setShieldDamage(float shielddamage)
-                { this->shielddamage_ = shielddamage;} //ShieldDamage wird korrekt gesettet vom XML-File
+                { this->shielddamage_ = shielddamage;}
             inline float getShieldDamage() const
                 { return this->shielddamage_; }

code/branches/gameimmersion/src/orxonox/worldentities/pawns/Pawn.cc

@@ -249 +249 @@
             }
 
-            else { COUT(3) << "## SHIELD : " << this->getShieldHealth() << endl; }
+ //           else { COUT(3) << "## SHIELD : " << this->getShieldHealth() << endl; }
 
             this->setHealth(this->health_ - healthdamage);
@@ -319 +319 @@
     void Pawn::hit(Pawn* originator, const Vector3& force, float damage, float healthdamage, float shielddamage)
     {
-        COUT(3) << "neue hit-Funktion wurde aufgerufen // " << std::flush;
+//        COUT(3) << "neue hit-Funktion wurde aufgerufen // " << std::flush;
         if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) )
         {