Changeset 6535 in orxonox.OLD

Timestamp:

Jan 18, 2006, 1:25:51 PM (18 years ago)

Author:

manuel

Message:

param- and weaponpowerup debugged and working

Location:

branches/powerups/src/world_entities

Files:

• playable.cc (modified) (1 diff)
• power_ups/weapon_power_up.cc (modified) (1 diff)

branches/powerups/src/world_entities/playable.cc

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

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

@@ -50 +50 @@
 void WeaponPowerUp::init()
 {
-  weaponXML = NULL;
-  weapon = NULL;
+  this->setClassID(CL_WEAPON_POWER_UP, "WeaponPowerUp");
+  this->weaponXML = NULL;
+  this->weapon = NULL;
 }