Changeset 5973 in orxonox.OLD

Timestamp:

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

Author:

manuel

Message:

needs fix in weapon_powert_up.cc (fabricate from string)

Location:

branches/powerups/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) (2 diffs)
• power_ups/weapon_power_up.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)

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

@@ -40 +40 @@
     if(dynamic_cast<Extendable*>(entity)->pickup(this))
     {
-      this->setVisibiliy(false);
+      this->hide();
     }
   }
 }
+
+void PowerUp::hide()
+{
+  this->setVisibiliy(false);
+}

branches/powerups/src/world_entities/power_ups/power_up.h

@@ -18 +18 @@
   PowerUp();
   virtual ~PowerUp ();
+  virtual void hide();
 };
 

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

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

@@ -20 +20 @@
 
   Weapon* getWeapon();
-  ClassID getWeaponID();
-  long getCapsNeeded();
+  void setWeaponClass(const char* name);
 
 private:
   void init();
   void loadParams(const TiXmlElement* root);
+private:
+  Weapon* weapon;
+  const TiXmlElement* weaponXML;
 
-private:
-  ClassID weaponID;
-  long capsNeeded;
+  void createWeapon();
 };
 

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

@@ -377 +377 @@
 {
   if(powerUp->isA(CL_WEAPON_POWER_UP)) {
-    WeaponPowerUp* wpu = dynamic_cast<WeaponPowerUp*>(powerUp);
+    Weapon weapon = dynamic_cast<WeaponPowerUp*>(powerUp)->getWeapon();
     WeaponManager* manager = this->getWeaponManager();
-    int slot = manager->getNextFreeSlot(0, wpu->getCapsNeeded());
+    int slot = manager->getNextFreeSlot(0, weapon->getCapability());
     if(slot >= 0) {
-      manager->addWeapon(wpu->getWeapon(), 0, slot);
+      manager->addWeapon(weapon, 0, slot);
       return true;
     }