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

Timestamp:

Feb 2, 2006, 10:20:16 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: added powerups

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;
 }
@@ -65 +64 @@
   {
     this->weaponXML = elem;
-    respawn();
+    newWeapon();
   }
   else
@@ -78 +77 @@
 }
 
-void WeaponPowerUp::respawn()
+bool WeaponPowerUp::process(WeaponManager* manager)
+{
+  if(manager->addWeapon(this->weapon)) {
+    newWeapon();
+  }
+  else {
+    manager->increaseAmmunition(this->weapon->getProjectileType(), this->weapon->getEnergy());
+  }
+  return true;
+}
+
+void WeaponPowerUp::newWeapon()
 {
   this->weapon = dynamic_cast<Weapon*>((weaponXML == NULL)
-      ? Factory::fabricate(static_cast<ClassID>(weaponID))
+      ? Factory::fabricate(static_cast<ClassID>(this->weapon->getLeafClassID()))
       : Factory::fabricate((TiXmlElement*)this->getXmlElem()->FirstChildElement("weapon")));
   this->model = this->weapon->getModel(0);
@@ -89 +99 @@
 {
   this->weapon = dynamic_cast<Weapon*>(Factory::fabricate(name));
-  this->weaponID = (ClassID)this->weapon->getLeafClassID();
   this->model = this->weapon->getModel(0);
 }