Changeset 5986 in orxonox.OLD

Timestamp:

Dec 8, 2005, 1:44:12 AM (18 years ago)

Author:

manuel

Message:

2 bugs resolved

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

@@ -56 +56 @@
   static_cast<PowerUp*>(this)->loadParams(root);
   const TiXmlElement* elem = root->FirstChildElement("weapon");
-  if(elem != NULL && (elem = weapon->getFirstChildElement()) != NULL)
+  if(elem != NULL && (elem = elem->getFirstChildElement()) != NULL)
   {
     this->weaponXML = elem;
@@ -63 +63 @@
   else
   {
-    LoadParam(root, "weaponID", this, const char*, setWeaponClass);
+    LoadParam(root, "weaponID", this, WeaponPowerUp, setWeaponClass);
   }
 }