Changeset 10022 in orxonox.OLD

Timestamp:

Dec 6, 2006, 2:38:25 PM (17 years ago)

Author:

nicolasc

Message:

finished systemFailure(), included RNG

Location:

branches/playability/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (3 diffs)
• space_ship.h (modified) (1 diff)

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -131 +131 @@
 {
 
+  srand(time(0));   //initialize Random Nomber Generator
+
   this->setSupportedPlaymodes(Playable::Vertical);
 
@@ -201 +203 @@
   shieldTH          = .2* shieldMax;   // shield power must be 20% before shield kicks in again
 
-  electronicCur = electronicMax = 50;
+  electronicCur = 1;
+  electronicMax = 50;
   electronicRegen   = 3;
   electronicTH      = .7 * electronicMax; // 30% of eDamage can be handled by the ship
@@ -766 +769 @@
 
 
-bool SpaceShip::systemFailure() 
-{
-  //srand(time(0)); TODO implement 
-  return (this->electronicCur < /*rand() */ this->electronicTH);
-}
-
-
 void SpaceShip::enterPlaymode(Playable::Playmode playmode)
 {

branches/playability/src/world_entities/space_ships/space_ship.h

@@ -83 +83 @@
     void weaponRegen(float time);   //!< weapon energy regeneration
 
-    inline bool systemFailure();
+    inline bool systemFailure() {  return (this->electronicCur < float(rand())/float(RAND_MAX) * this->electronicTH); };
 
     //WeaponManager         weaponMan;      //!< the primary weapon manager: managing a list of energy weapons to wepaon-slot mapping