Changeset 7077 in orxonox.OLD for trunk/src/world_entities/power_ups/weapon_power_up.cc

Timestamp:

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

Author:

bensch

Message:

health

File:

• trunk/src/world_entities/power_ups/weapon_power_up.cc (modified) (3 diffs)

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);
 }