Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 10, 2008, 5:30:39 PM (17 years ago)
Author:
polakma
Message:

fixed projectile, particle effect, reloadingTimer and magazineTimer

File:
1 edited

Legend:

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

    r2327 r2391  
    7373    void WeaponSlot::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    7474    {
    75 
     75        SUPER(WeaponSlot, XMLPort, xmlelement, mode);
    7676    }
    7777
    78     void WeaponSlot::attachWeapon(Weapon *weaponPointer)
    79     {   this->attachedWeapon_ = weaponPointer;   }
     78    void WeaponSlot::attachWeapon(Weapon *weapon)
     79    {
     80        this->attachedWeapon_ = weapon;
     81        this->attach(weapon);
     82COUT(0) << "WeaponSlot::attachWeapon position=" << this->getWorldPosition() << std::endl;
     83    }
    8084
    8185    Weapon * WeaponSlot::getAttachedWeapon() const
Note: See TracChangeset for help on using the changeset viewer.