Changeset 4906 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/weapon_manager.cc

Timestamp:

Jul 20, 2005, 1:41:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: states are now flow'n through

File:

• orxonox/trunk/src/world_entities/weapons/weapon_manager.cc (modified) (6 diffs)

orxonox/trunk/src/world_entities/weapons/weapon_manager.cc

@@ -75 +75 @@
       this->configs[i].slots[j] = NULL;
   }
-  this->currConfID = W_CONFIG0;
+  this->currConfID = WM_CONFIG0;
 
 
@@ -141 +141 @@
  *
  * if you add explicitly a weapon at config:n, slot:m, the weapon placed at this location will be
- * replaced by the weapon specified. if you use the W_FREE_SLOT, the manager will look for a free
+ * replaced by the weapon specified. if you use the WM_FREE_SLOT, the manager will look for a free
  * slot in this weaponconfiguration. if there is non, the weapon won't be added and there will be
  * a error message.
@@ -147 +147 @@
 void WeaponManager::addWeapon(Weapon* weapon, int configID, int slotID)
 {
-  if( slotID == W_FREE_SLOT)
+  if( slotID == WM_FREE_SLOT)
   {
     int freeSlot = this->getNextFreeSlot( configID);
@@ -187 +187 @@
   lastConfID = this->currConfID;
   for(i = this->currConfID + 1; i < W_MAX_CONFIGS && !this->configs[i].bUsed; ++i);
-  if( i == W_MAX_CONFIGS) this->currConfID = W_CONFIG0;
+  if( i == W_MAX_CONFIGS) this->currConfID = WM_CONFIG0;
   else this->currConfID = i;
 
@@ -241 +241 @@
 {
   Weapon* w;
-  for (int j = 0; j < 4; ++j )
-    for(int i = 0; i < W_MAX_SLOTS; ++i)
-  {
-    w = this->configs[j].slots[i];
-    if( w != NULL) w->tick(dt);
+  for(int i = 0; i < W_MAX_SLOTS; ++i)
+  {
+    w = this->configs[this->currConfID].slots[i];
+    if( w != NULL && w->isActive())
+      w->tickW(dt);
   }
 
@@ -262 +262 @@
   {
     w = this->configs[j].slots[i];
-    if( w != NULL)
+    if( w != NULL && w->isVisible())
       w->draw();
   }