Changeset 3074 for code/trunk/src/orxonox/objects/weaponsystem

Timestamp:

May 25, 2009, 8:40:39 PM (15 years ago)

Author:

landauf

Message:

removed some warnings and fixed an include error

Location:

code/trunk/src/orxonox/objects/weaponsystem

Files:

• Munition.cc (modified) (1 diff)
• WeaponSystem.cc (modified) (1 diff)

code/trunk/src/orxonox/objects/weaponsystem/Munition.cc

@@ -356 +356 @@
             return false;
 
-        if (amount <= needed_magazines)
+        if (amount <= (unsigned int)needed_magazines)
         {
             // We need more magazines than we get, so just add them

code/trunk/src/orxonox/objects/weaponsystem/WeaponSystem.cc

@@ -214 +214 @@
         unsigned int i = 0;
         Weapon* weapon = 0;
-        while (weapon = wPack->getWeapon(i++))
+        while ((weapon = wPack->getWeapon(i++)))
             weapon->getWeaponSlot()->removeWeapon();