Changeset 7077 in orxonox.OLD for trunk/src

Timestamp:

Feb 7, 2006, 4:06:56 PM (19 years ago)

Author:

bensch

Message:

health

Location:

trunk/src/world_entities

Files:

• power_ups/power_up.cc (modified) (1 diff)
• power_ups/power_up.h (modified) (1 diff)
• power_ups/weapon_power_up.cc (modified) (3 diffs)
• projectiles/laser.cc (modified) (2 diffs)

trunk/src/world_entities/power_ups/power_up.cc

@@ -144 +144 @@
     {
       this->toList(OM_COMMON);
-      this->soundSource.play(this->respawnBuffer);
+      if (likely(this->respawnBuffer != NULL))
+        this->soundSource.play(this->respawnBuffer);
 
     }

trunk/src/world_entities/power_ups/power_up.h

@@ -40 +40 @@
   PowerUp(float r, float g, float b);
   virtual ~PowerUp ();
+
+protected:
   Model* model;
 

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -34 +34 @@
 {
   this->init();
-  this->loadPickupSound("sound/powerups/whats this2.wav");
   if( root != NULL)
     this->loadParams(root);
@@ -48 +47 @@
 {
   this->setClassID(CL_WEAPON_POWER_UP, "WeaponPowerUp");
+  this->loadPickupSound("sound/powerups/whats this2.wav");
+
   this->weaponXML = NULL;
   this->weapon = NULL;
@@ -95 +96 @@
 {
   this->weapon = dynamic_cast<Weapon*>(Factory::fabricate(name));
+  if (this->weapon == NULL)
+  {
+    PRINTF(1)("Unable to load Weapon. %s\n", name);
+    this->weapon = dynamic_cast<Weapon*>(Factory::fabricate("Turret"));
+  }
   this->model = this->weapon->getModel(0);
 }

trunk/src/world_entities/projectiles/laser.cc

@@ -44 +44 @@
   this->loadModel("models/projectiles/laser.obj");
 
-  this->setMinEnergy(1);
+  this->setMinEnergy(10);
   this->setHealthMax(10);
   this->lifeSpan = 5.0;
@@ -90 +90 @@
     Laser::explosionParticles->setColor(1.0, .8,.8,.7,.0);
   }
+
+  this->setHealth(10);
 }