Changeset 8386 for code/branches/gameimmersion/src/modules

Timestamp:

May 2, 2011, 5:17:20 PM (14 years ago)

Author:

simonmie

Message:

New shielddamage implemented, depending functions changed, bugs fixed.

LightningGun →fire changed
Other weapons still need to be edited

Location:

code/branches/gameimmersion/src/modules/weapons

Files:

• projectiles/Projectile.cc (modified) (2 diffs)
• projectiles/Projectile.h (modified) (2 diffs)
• weaponmodes/LightningGun.cc (modified) (1 diff)

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

@@ -48 +48 @@
         this->bDestroy_ = false;
         this->owner_ = 0;
-        this->damage_ = 15;
+        this->damage_ = 115;
+///////////////////me
+        this->healthdamage_ = 0;
+        this->shielddamage_ = 0;
+///////////////////end me
 
         // Get notification about collisions
@@ -139 +143 @@
             if (victim)
             {
-                victim->hit(this->owner_, contactPoint, this->damage_);
+                victim->hit(this->owner_, contactPoint, this->damage_, this->healthdamage_, this->shielddamage_);
                 victim->startReloadCountdown();
             }

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

@@ -50 +50 @@
 
             inline void setDamage(float damage)
-                { this->damage_ = damage; }
+                { this->damage_ = damage;  COUT(3) << "DAMAGE-SET-FUNKTION WIRD AUFGERUFEN" << endl; }
             inline float getDamage() const
                 { return this->damage_; }
@@ -58 +58 @@
                 { return this->owner_; }
 
+////////////////////me
+
+            inline void setHealthDamage(float healthdamage)
+                { this->healthdamage_ = healthdamage; }
+            inline float getHealthDamage() const
+                { return this->healthdamage_; }
+
+            inline void setShieldDamage(float shielddamage)
+                { this->shielddamage_ = shielddamage; COUT(3) << "SHIELDDAMAGE SET TO " << shielddamage << endl; } //ShieldDamage wird korrekt gesettet vom XML-File
+            inline float getShieldDamage() const
+                { return this->shielddamage_; }
+
+///////////////////end me
+
+
         private:
             WeakPtr<Pawn> owner_;
             float lifetime_;
             float damage_;
+///////me
+            float healthdamage_;
+            float shielddamage_;
+///////end me
             bool bDestroy_;
             Timer destroyTimer_;

code/branches/gameimmersion/src/modules/weapons/weaponmodes/LightningGun.cc

@@ -69 +69 @@
         projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
         projectile->setDamage(this->getDamage());
+        projectile->setShieldDamage(this->getShieldDamage());
     }
 }