Changeset 6728 in orxonox.OLD

Timestamp:

Jan 25, 2006, 6:02:36 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now Weapons get Loaded on pickup

Location:

trunk/src/world_entities/weapons

Files:

• weapon.cc (modified) (9 diffs)
• weapon_manager.cc (modified) (1 diff)

trunk/src/world_entities/weapons/weapon.cc

@@ -126 +126 @@
 }
 
+
 /**
  * sets the Projectile to use for this weapon.
@@ -156 +157 @@
 }
 
+
 /**
  * @see bool Weapon::setProjectile(ClassID projectile)
@@ -175 +177 @@
 }
 
+
 /**
  * prepares Projectiles of the Weapon
@@ -186 +189 @@
     PRINTF(2)("unable to create %d projectile for Weapon %s (%s)\n", count, this->getName(), this->getClassName());
 }
+
 
 /**
@@ -218 +222 @@
   this->emissionPoint.setRelCoor(point);
 }
+
 
 /**
@@ -247 +252 @@
 }
 
+
 /**
  * creates/returns an Animation3D for a certain State.
@@ -325 +331 @@
 }
 
+
 /**
  * adds energy to the Weapon
@@ -345 +352 @@
   }
 }
+
 
 ////////////////////////////////////////////////////////////
@@ -519 +527 @@
     this->animation[state]->replay();
 
-  this->stateDuration = this->times[state] + this->stateDuration;
+  this->stateDuration += this->times[state];
   this->currentState = state;
 }

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -272 +272 @@
     this->parent->addChild(weapon);
   }
+  if(configID == this->currentConfigID)
+    this->currentSlotConfig[slotID].nextWeapon = weapon;
   PRINTF(3)("Added a new Weapon (%s::%s) to the WeaponManager: config %i/ slot %i\n", weapon->getClassName(), weapon->getName(), configID, slotID);
   return true;