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

Timestamp:

Jul 21, 2005, 4:59:16 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: the activation and deactivation-phase of the Weapon work too.

File:

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

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

@@ -34 +34 @@
  * @param number of weapon slots of the model/ship <= 8 (limitied)
  */
-WeaponManager::WeaponManager(int nrOfSlots)
+WeaponManager::WeaponManager(int slotCount)
 {
   this->init();
-  this->nrOfSlots = nrOfSlots;
+  this->slotCount = slotCount;
 }
 
@@ -127 +127 @@
 /**
  * sets the number of Slots the WeaponManager has
- * @param nrOfSlots the number of slots
- */
-void WeaponManager::setSlotCount(int nrOfSlots)
-{
-  this->nrOfSlots = nrOfSlots;
+ * @param slotCount the number of slots
+ */
+void WeaponManager::setSlotCount(int slotCount)
+{
+  this->slotCount = slotCount;
 }
 
@@ -150 +150 @@
   {
     int freeSlot = this->getNextFreeSlot( configID);
-    if( freeSlot < 0 || freeSlot >= this->nrOfSlots)
+    if( freeSlot < 0 || freeSlot >= this->slotCount)
     {
       PRINTF(0)("There is no free slot in this WeaponConfig to dock this weapon at! Aborting\n");
@@ -262 +262 @@
   {
     w = this->configs[j].slots[i];
-    if( w != NULL)// && w->isVisible())
+    if( w != NULL && w->isVisible())
       w->draw();
   }