Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 3, 2008, 4:30:13 PM (16 years ago)
Author:
polakma
Message:

fixed parentWeaponSystem-Pointer bugs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.cc

    r2319 r2327  
    5555        //WeaponSystem
    5656        weaponSystem_ = new WeaponSystem(this);
     57        /*
    5758        WeaponSet * weaponSet1 = new WeaponSet(this,1);
    5859        this->weaponSystem_->attachWeaponSet(weaponSet1);
    5960        //totally bad solution...
    6061        weaponSet1->setParentWeaponSystem(weaponSystem_);
    61 
     62        */
    6263
    6364        this->registerVariables();
     
    157158
    158159    void Pawn::setWeaponSlot(WeaponSlot * wSlot)
    159     {   this->weaponSystem_->attachWeaponSlot(wSlot);   }
     160    {   
     161COUT(0) << "Pawn::setWeaponSlot" << std::endl;
     162        this->weaponSystem_->attachWeaponSlot(wSlot);   }
    160163    WeaponSlot * Pawn::getWeaponSlot(unsigned int index) const
    161164    {   return this->weaponSystem_->getWeaponSlotPointer(index);    }
    162165   
    163166    void Pawn::setWeaponPack(WeaponPack * wPack)
    164     {   this->weaponSystem_->attachWeaponPack( wPack,wPack->getFireMode() );   }
     167    {   
     168COUT(0) << "Pawn::setWeaponPack" << std::endl;
     169        this->weaponSystem_->attachWeaponPack( wPack,wPack->getFireMode() );   }
    165170    WeaponPack * Pawn::getWeaponPack(unsigned int firemode) const
    166171    {   return this->weaponSystem_->getWeaponPackPointer(firemode);    }
    167172   
    168173    void Pawn::setWeaponSet(WeaponSet * wSet)
    169     {   this->weaponSystem_->attachWeaponSet(wSet);   }
     174    {   
     175COUT(0) << "Pawn::setWeaponSet" << std::endl;
     176        this->weaponSystem_->attachWeaponSet(wSet);   }
    170177    WeaponSet * Pawn::getWeaponSet(unsigned int index) const
    171178    {   return this->weaponSystem_->getWeaponSetPointer(index);    }
Note: See TracChangeset for help on using the changeset viewer.