Changeset 10438 in orxonox.OLD for trunk/src

Timestamp:

Jan 28, 2007, 1:36:22 PM (18 years ago)

Author:

patrick

Message:

switch completed

Location:

trunk/src/world_entities/weapons

Files:

• weapon_manager.cc (modified) (7 diffs)
• weapon_slot.h (modified) (1 diff)

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -316 +316 @@
   weapon->setAmmoContainer(this->getAmmoContainer(weapon->getProjectileType()));
   if(configID == this->currentConfigID)
-    this->currentSlotConfig[slotID]->nextWeapon = weapon;
+    this->currentSlotConfig[slotID]->setNextWeapon(weapon);
   //if (this->parent != NULL)
   {
@@ -425 +425 @@
 
   for (int i = 0; i < WM_MAX_SLOTS; i++)
-    this->currentSlotConfig[i]->nextWeapon = this->configs[currentConfigID][i];
+    this->currentSlotConfig[i]->setNextWeapon(this->configs[currentConfigID][i]);
 }
 
@@ -458 +458 @@
   for(int i = 0; i < this->slotCount; i++)
   {
-    firingWeapon = this->currentSlotConfig[i]->currentWeapon;
+    firingWeapon = this->currentSlotConfig[i]->getCurrentWeapon();
     if( firingWeapon != NULL) firingWeapon->requestAction(WA_NONE);
   }
@@ -485 +485 @@
 
     // current Weapon in Slot i
-    tickWeapon = this->currentSlotConfig[i]->currentWeapon;
+    tickWeapon = this->currentSlotConfig[i]->getCurrentWeapon();
     // On A change (current != next)
-    if (tickWeapon != this->currentSlotConfig[i]->nextWeapon)
+    if (tickWeapon != this->currentSlotConfig[i]->getNextWeapon())
     {
       // if a Weapon is Active in slot i, deactivate it.
@@ -500 +500 @@
         {
           tickWeapon->toList(OM_NULL);
-          this->currentSlotConfig[i]->currentWeapon = NULL;
+          this->currentSlotConfig[i]->setCurrentWeapon(NULL);
         }
       }
       // switching to next Weapon
-      tickWeapon = this->currentSlotConfig[i]->currentWeapon = this->currentSlotConfig[i]->nextWeapon;
+      this->currentSlotConfig[i]->setCurrentWeapon(this->currentSlotConfig[i]->getNextWeapon());
+      tickWeapon = this->currentSlotConfig[i]->getCurrentWeapon();
 
       if (tickWeapon != NULL)
@@ -520 +521 @@
     }
     else if (unlikely(tickWeapon != NULL && tickWeapon->getCurrentState() == WS_DEACTIVATING))
-      this->currentSlotConfig[i]->nextWeapon = NULL;
+      this->currentSlotConfig[i]->setNextWeapon(NULL);
   }
 }
@@ -534 +535 @@
   for (int i = 0; i < this->slotCount; i++)
   {
-    drawWeapon = this->currentSlotConfig[i]->currentWeapon;
+    drawWeapon = this->currentSlotConfig[i]->getCurrentWeapon();
     if( drawWeapon != NULL && drawWeapon->isVisible())
       drawWeapon->draw();

trunk/src/world_entities/weapons/weapon_slot.h

@@ -33 +33 @@
   inline void setNextWeapon(Weapon* weapon) { this->nextWeapon = weapon; }
 
-//   private:
+private:
 
   long          capability;             //!< the capabilities of the Slot @see WeaponSlotCapability.