Changeset 2186 for code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc

Timestamp:

Nov 12, 2008, 12:50:18 PM (15 years ago)

Author:

polakma

Message:

made some changes (still doesn't compile)

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) (4 diffs)

code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc

@@ -52 +52 @@
         this->activeWeaponSet_ = 0;
         this->parentSpaceShip_ = 0;
-        //this->attachedMunition_ =0;
+        this->attachedMunition_ =0;
     }
 
@@ -80 +80 @@
     void WeaponSystem::fire(WeaponMode::Enum n)
     {
-        if (n < this->weaponSets_.size())
+        if (n < (int)this->weaponSets_.size())
             this->weaponSets_[n]->fire();
     }
@@ -98 +98 @@
     }
 
-    /*
+    Munition * WeaponSystem::getAttachedMunitionPointer()
+    {
+        return this->attachedMunition_;
+    }
+
     void WeaponSystem::addMunitionType(Munition *munitionPointer)
     {
@@ -106 +110 @@
             this->attachedMunition_ = munitionPointer;
         else
-            this->unlimitedAmmo_ = true;
+            ;//was?
 
     }
-    */
+
 
 }