Changeset 10539 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Jan 31, 2007, 4:27:32 AM (18 years ago)

Author:

marcscha

Message:

Fixes for weapon systems

Location:

trunk/src/world_entities/weapons

Files:

• acid_launcher.cc (modified) (2 diffs)
• heavy_blaster.cc (modified) (1 diff)
• light_blaster.cc (modified) (1 diff)
• medium_blaster.cc (modified) (1 diff)
• swarm_launcher.cc (modified) (3 diffs)
• weapon_manager.cc (modified) (2 diffs)

trunk/src/world_entities/weapons/acid_launcher.cc

@@ -124 +124 @@
 void AcidLauncher::tick(float dt)
 {
+  if (!Weapon::tickW(dt))
+    return;
   if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
   {
@@ -130 +132 @@
   }
 
-  if (!Weapon::tickW(dt))
-    return;
+
   /*
   Quaternion quat;

trunk/src/world_entities/weapons/heavy_blaster.cc

@@ -272 +272 @@
 void HeavyBlaster::tick(float dt)
 {
+  if (!Weapon::tickW(dt))
+    return;
   if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
   {

trunk/src/world_entities/weapons/light_blaster.cc

@@ -179 +179 @@
 void LightBlaster::tick(float dt)
 {
+  if (!Weapon::tickW(dt))
+    return;
   if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
   {

trunk/src/world_entities/weapons/medium_blaster.cc

@@ -178 +178 @@
 void MediumBlaster::tick(float dt)
 {
+  if (!Weapon::tickW(dt))
+    return;
   if (this->energyWidget != NULL && !this->isEnergyWidgetInitialized)
   {

trunk/src/world_entities/weapons/swarm_launcher.cc

@@ -22 +22 @@
 
 #include "model.h"
+#include "world_entities/npcs/npc.h"
 
 #include "state.h"
@@ -157 +158 @@
   PRINTF(0)("fire\n");
   Projectile* pj = NULL;
-  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
+  for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)
   {
-    if( ((*eIterator)->getOMListNumber() != (this->getOMListNumber() -1)) && ((*eIterator)->getClassCName() != "Weapon") && ((*eIterator)->getClassCName() != "Projectile") && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 300)
+    if( ((*eIterator)->getOMListNumber() != (this->getOMListNumber())) && ((*eIterator)->getClassCName() != "Weapon") && ((*eIterator)->getClassCName() != "Projectile") && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 300)
     {
       pj  = this->getProjectile();
@@ -172 +173 @@
       pj->setAbsDir(this->getAbsDir());
       dynamic_cast<SwarmProjectile*>(pj)->setTarget( (PNode*)(*eIterator) );
-      //pj->toList(OM_GROUP_01_PROJ);
       pj->activate();
     }

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -442 +442 @@
     {
       if( firingWeapon->getCurrentState() == WS_SHOOTING) continue;
-
       firingWeapon->requestAction(WA_SHOOT);
     }
@@ -454 +453 @@
 
 /**
- * triggers fire of all weapons in the current weaponconfig
+ * triggers release fire of all weapons in the current weaponconfig
  */
 void WeaponManager::releaseFire()