Changeset 8145 for code

Timestamp:

Mar 28, 2011, 3:55:04 PM (14 years ago)

Author:

simonmie

Message:

First try of self-reloading shield

Location:

code/branches/gameimmersion/src/orxonox/worldentities/pawns

Files:

• Pawn.cc (modified) (4 diffs)
• Pawn.h (modified) (2 diffs)

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

@@ -118 +118 @@
         XMLPortObject(Pawn, WeaponSet, "weaponsets", addWeaponSet, getWeaponSet, xmlelement, mode);
         XMLPortObject(Pawn, WeaponPack, "weapons", addWeaponPackXML, getWeaponPack, xmlelement, mode);
+
+/////// me
+        XMLPortParam(Pawn, "reloadrate", setReloadRate, getReloadRate, xmlelement, mode).defaultValues(0);
+
+/////// end me
+
     }
 
@@ -137 +143 @@
         this->bReload_ = false;
 
+////////me
+        this->addShieldHealth(this->getReloadRate() * dt);
+////////end me
         if (GameMode::isMaster())
             if (this->health_ <= 0 && bAlive_)
             {
-                this->fireEvent(); // Event to notify anyone who want's to know about the death.
+                this->fireEvent(); // Event to notify anyone who wants to know about the death.
                 this->death();
             }
@@ -167 +176 @@
         ControllableEntity::removePlayer();
     }
+
+//////////////////me
+    void Pawn::setReloadRate(float reloadrate)
+    {
+        this->reloadRate_ = reloadrate;
+        COUT(2) << "RELOAD RATE SET TO " << this->reloadRate_ << endl;
+    }
+
+
+///////////////end me
 
     void Pawn::setHealth(float health)
@@ -186 +205 @@
                 healthdamage += shielddamage-this->getShieldHealth();
                 this->setShieldHealth(0);
+                COUT(3) << "### SHIELD KAPUTT ###" << endl;
             }
+
+            else { COUT(3) << "## SHIELD : " << this->getShieldHealth() << endl; }
 
             this->setHealth(this->health_ - healthdamage);

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

@@ -53 +53 @@
             inline bool isAlive() const
                 { return this->bAlive_; }
+
+///////////////////////////////// me
+            virtual void setReloadRate(float reloadrate);
+            inline float getReloadRate() const
+                { return this->reloadRate_; }
+
+            inline void addShieldHealth(float amount)
+            { this->setShieldHealth(this->shieldHealth_ + amount); }
+
+///////////////////////////////// end me
 
             virtual void setHealth(float health);
@@ -151 +161 @@
                 { return NULL; }
 
+/////////////////////////// me
+            float reloadRate_;
+
+////////////////////////// end me
+
             float health_;
             float maxHealth_;