Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 26, 2008, 7:42:29 PM (17 years ago)
Author:
polakma
Message:

added WeaponPack

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSlot.h

    r2232 r2288  
    5050            void fire();
    5151
    52             inline void setParentWeaponSet(WeaponSet *parentWeaponSet)
    53                 { parentWeaponSet_=parentWeaponSet; }
    54             inline WeaponSet * getParentWeaponSet()
    55                 { return parentWeaponSet_; }
     52            inline void setParentWeaponSystem(WeaponSystem *parentWeaponSystem)
     53                { parentWeaponSystem_=parentWeaponSystem; }
     54            inline WeaponSystem * getParentWeaponSystem()
     55                { return parentWeaponSystem_; }
    5656
    5757
    … …  
    6060            bool unlimitedAmmo_;
    6161
    62             WeaponSet *parentWeaponSet_;
     62            WeaponSystem *parentWeaponSystem_;
    6363    };
    6464}
Note: See TracChangeset for help on using the changeset viewer.