Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2347


Ignore:
Timestamp:
Dec 5, 2008, 11:44:37 AM (15 years ago)
Author:
polakma
Message:

debugging changes

Location:
code/branches/weapon2/src/orxonox/objects/weaponSystem
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.cc

    r2337 r2347  
    107107
    108108    void Weapon::setMunitionType(std::string munitionType)
    109     {   this->munitionType_ = munitionType; }
     109    {   
     110COUT(0) << "Weapon::setMunitionType (XMLPort) "<< munitionType << std::endl;
     111this->munitionType_ = munitionType; }
    110112
    111113    std::string Weapon::getMunitionType()
  • code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponPack.cc

    r2337 r2347  
    9797    {
    9898        weapon->setParentWeaponSystem(this->parentWeaponSystem_);
     99COUT(0) << "WeaponPack::addWeapon " << weapon->getMunitionType() << std::endl;
    99100        this->weapons_.push_back(weapon);
    100101    }
    101    
     102
    102103    Weapon * WeaponPack::getWeapon(unsigned int index)
    103104    {
     
    111112            this->weapons_[i]->setParentWeaponSystem(weaponSystem);
    112113        }
    113        
     114
    114115    }
    115116}
  • code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc

    r2337 r2347  
    4848        //this->setLoadingTime(0.5);
    4949
    50         //how could it be loaded by XML
     50COUT(0) << "LaserGun::LaserGun" << std::endl;
    5151        this->attachNeededMunition(this->getMunitionType());
    5252    }
     
    6161        if ( this->getBulletReadyToShoot() && this->getMagazineReadyToShoot() )
    6262        {
    63 COUT(0) << "LaserGun::fire - ready to shoot" << std::endl;   
     63COUT(0) << "LaserGun::fire - ready to shoot" << std::endl;
    6464            //take munition
     65            this->setBulletReadyToShoot(false);
     66            Weapon::bulletTimer();
    6567            this->getAttachedMunition(this->munitionType_)->removeBullets(1,this);
    66             Weapon::bulletTimer();
    67             this->setBulletReadyToShoot(false);
    6868
    6969            //create projectile
Note: See TracChangeset for help on using the changeset viewer.