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

Timestamp:

Jan 25, 2006, 4:18:12 PM (20 years ago)

Author:

bensch

Message:

merged the powerups back to the trunk

File:

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

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -53 +53 @@
   this->setClassID(CL_WEAPON_POWER_UP, "WeaponPowerUp");
   this->weaponXML = NULL;
+  this->weaponID = CL_NULL;
   this->weapon = NULL;
 }
@@ -70 +71 @@
     LoadParam(root, "weaponID", this, WeaponPowerUp, setWeaponClass);
   }
-  this->model = this->weapon->getModel(0);
 }
 
@@ -81 +81 @@
 {
   this->weapon = dynamic_cast<Weapon*>((weaponXML == NULL)
-      ? Factory::fabricate(static_cast<ClassID>(this->weapon->getClassID()))
-      : Factory::fabricate(weaponXML));
+      ? Factory::fabricate(static_cast<ClassID>(weaponID))
+      : Factory::fabricate((TiXmlElement*)this->getXmlElem()->FirstChildElement("weapon")));
+  this->model = this->weapon->getModel(0);
 }
 
@@ -88 +89 @@
 {
   this->weapon = dynamic_cast<Weapon*>(Factory::fabricate(name));
+  this->weaponID = (ClassID)this->weapon->getLeafClassID();
+  this->model = this->weapon->getModel(0);
 }