Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 19, 2009, 4:55:08 PM (16 years ago)
Author:
polakma
Message:

some enhancements, but not working…

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/weaponsystem/src/orxonox/objects/weaponSystem/WeaponSystem.cc

    r2778 r2804  
    5151        RegisterObject(WeaponSystem);
    5252
    53         this->activeWeaponSet_ = 0;
    5453        this->parentPawn_ = 0;
    5554    }
     
    9190    Munition * WeaponSystem::getMunitionType(std::string munitionType)
    9291    {
    93 //COUT(0) << "WeaponSystem::getMunitionType " << munitionType << std::endl;
    9492        std::map<std::string, Munition *>::const_iterator it = this->munitionSharedSet_.find(munitionType);
    9593        if (it != this->munitionSharedSet_.end())
     
    105103    //n is the n'th weaponSet, starting with zero
    106104    //SpaceShip.cc only needs to have the keybinding to a specific Set-number n (=firemode)
     105    //in future this could be well defined and not only for 3 different WeaponModes
    107106    void WeaponSystem::fire(WeaponMode::Enum n)
    108107    {
     
    120119                break;
    121120        }
    122 //COUT(0) << "WeaponSystem::fire" << std::endl;
    123121        if (set < (int)this->weaponSets_.size())
    124 //COUT(0) << "WeaponSystem::fire - after if" << std::endl;
    125122            this->weaponSets_[set]->fire();
    126123    }
Note: See TracChangeset for help on using the changeset viewer.