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

Timestamp:

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

Author:

landauf

Message:

removed some warnings and fixed an include error

Location:

code/trunk/src/orxonox/objects

Files:

• pickup/PickupCollection.cc (modified) (1 diff)
• pickup/PickupInventory.cc (modified) (2 diffs)
• pickup/items/Jump.cc (modified) (1 diff)
• pickup/items/Jump.h (modified) (1 diff)
• weaponsystem/Munition.cc (modified) (1 diff)
• weaponsystem/WeaponSystem.cc (modified) (1 diff)

code/trunk/src/orxonox/objects/pickup/PickupCollection.cc

@@ -90 +90 @@
     bool PickupCollection::checkSlot(BaseItem* item)
     {
-        return (this->items_.count(item->getPickupIdentifier()) < item->getMaxCarryAmount());
+        return ((int)this->items_.count(item->getPickupIdentifier()) < item->getMaxCarryAmount());
     }
     /**

code/trunk/src/orxonox/objects/pickup/PickupInventory.cc

@@ -250 +250 @@
     {
         Pawn* pawn;
-        if(pawn = HumanController::getLocalControllerEntityAsPawn())
+        if((pawn = HumanController::getLocalControllerEntityAsPawn()))
         {
             std::deque<EquipmentItem*> items = pawn->getPickups().getEquipmentItems();
@@ -274 +274 @@
     {
         Pawn* pawn;
-        if(pawn = HumanController::getLocalControllerEntityAsPawn())
+        if((pawn = HumanController::getLocalControllerEntityAsPawn()))
         {
             std::deque<UsableItem*> items = pawn->getPickups().getUsableItems();

code/trunk/src/orxonox/objects/pickup/items/Jump.cc

@@ -33 +33 @@
 
 #include "Jump.h"
-#include "DroppedItem.h"
+#include "objects/pickup/DroppedItem.h"
 
 #include "objects/worldentities/pawns/Pawn.h"

code/trunk/src/orxonox/objects/pickup/items/Jump.h

@@ -39 +39 @@
 #include "OrxonoxPrereqs.h"
 
-#include "UsableItem.h"
+#include "objects/pickup/UsableItem.h"
 #include "util/Math.h"
 

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();