Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3074


Ignore:
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
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/network/Host.cc

    r3059 r3074  
    108108    for (ObjectList<ChatListener>::iterator it = ObjectList<ChatListener>::begin(); it != ObjectList<ChatListener>::end(); ++it)
    109109      it->incomingChat(message, 0);
     110    return true;
    110111  }
    111112  else
  • code/trunk/src/orxonox/objects/pickup/PickupCollection.cc

    r3073 r3074  
    9090    bool PickupCollection::checkSlot(BaseItem* item)
    9191    {
    92         return (this->items_.count(item->getPickupIdentifier()) < item->getMaxCarryAmount());
     92        return ((int)this->items_.count(item->getPickupIdentifier()) < item->getMaxCarryAmount());
    9393    }
    9494    /**
  • code/trunk/src/orxonox/objects/pickup/PickupInventory.cc

    r3073 r3074  
    250250    {
    251251        Pawn* pawn;
    252         if(pawn = HumanController::getLocalControllerEntityAsPawn())
     252        if((pawn = HumanController::getLocalControllerEntityAsPawn()))
    253253        {
    254254            std::deque<EquipmentItem*> items = pawn->getPickups().getEquipmentItems();
     
    274274    {
    275275        Pawn* pawn;
    276         if(pawn = HumanController::getLocalControllerEntityAsPawn())
     276        if((pawn = HumanController::getLocalControllerEntityAsPawn()))
    277277        {
    278278            std::deque<UsableItem*> items = pawn->getPickups().getUsableItems();
  • code/trunk/src/orxonox/objects/pickup/items/Jump.cc

    r3073 r3074  
    3333
    3434#include "Jump.h"
    35 #include "DroppedItem.h"
     35#include "objects/pickup/DroppedItem.h"
    3636
    3737#include "objects/worldentities/pawns/Pawn.h"
  • code/trunk/src/orxonox/objects/pickup/items/Jump.h

    r3073 r3074  
    3939#include "OrxonoxPrereqs.h"
    4040
    41 #include "UsableItem.h"
     41#include "objects/pickup/UsableItem.h"
    4242#include "util/Math.h"
    4343
  • code/trunk/src/orxonox/objects/weaponsystem/Munition.cc

    r3053 r3074  
    356356            return false;
    357357
    358         if (amount <= needed_magazines)
     358        if (amount <= (unsigned int)needed_magazines)
    359359        {
    360360            // We need more magazines than we get, so just add them
  • code/trunk/src/orxonox/objects/weaponsystem/WeaponSystem.cc

    r3053 r3074  
    214214        unsigned int i = 0;
    215215        Weapon* weapon = 0;
    216         while (weapon = wPack->getWeapon(i++))
     216        while ((weapon = wPack->getWeapon(i++)))
    217217            weapon->getWeaponSlot()->removeWeapon();
    218218
Note: See TracChangeset for help on using the changeset viewer.