Changeset 5973 in orxonox.OLD for branches/powerups/src/world_entities/power_ups/weapon_power_up.cc

Timestamp:

Dec 7, 2005, 5:02:50 PM (19 years ago)

Author:

manuel

Message:

needs fix in weapon_powert_up.cc (fabricate from string)

File:

• branches/powerups/src/world_entities/power_ups/weapon_power_up.cc (modified) (2 diffs)

branches/powerups/src/world_entities/power_ups/weapon_power_up.cc

@@ -22 +22 @@
 
 #include "primitive_model.h"
+
+#include "factory.h"
+#include "load_param.h"
 
 using namespace std;
@@ -52 +55 @@
 {
   static_cast<PowerUp*>(this)->loadParams(root);
-
+  const TiXmlElement* elem = root->FirstChildElement("weapon");
+  if(elem != NULL && (elem = weapon->getFirstChildElement()) != NULL)
+  {
+    this->weaponXML = elem;
+    createWeapon();
+  }
+  else
+  {
+    LoadParam(root, "weaponID", this, const char*, setWeaponClass);
+  }
 }
 
 Weapon* WeaponPowerUp::getWeapon()
 {
-  return dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(this->getWeaponID()));
+  return this->weapon;
 }
 
-ClassID WeaponPowerUp::getWeaponID()
+void WeaponPowerUp::createWeapon()
 {
-  return this->weaponID;
+  this->weapon = dynamic_cast<Weapon*>((weaponXML == NULL)
+      ? Factory::getFirst()->fabricate(static_cast<ClassID>(this->weapon->getClassID()))
+      : Factory::getFirst()->fabricate(weaponXML));
 }
 
-long WeaponPowerUp::getCapsNeeded()
+void WeaponPowerUp::setWeaponClass(const char* name)
 {
-  return this->capsNeeded;
+  this->weapon = dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(name, name));
 }