Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/branches/questsystem5/src/orxonox/objects/pickup/Usable.h @ 3015

Last change on this file since 3015 was 2908, checked in by dafrick, 16 years ago

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. ;))
  • Property svn:eol-style set to native
  • Property svn:mergeinfo set to (toggle deleted branches)
    /code/branches/lodfinal/src/orxonox/objects/pickup/Usable.hmergedeligible
    /code/branches/buildsystem2/src/orxonox/objects/pickup/Usable.h2506-2658
    /code/branches/buildsystem3/src/orxonox/objects/pickup/Usable.h2662-2708
    /code/branches/ceguilua/src/orxonox/objects/pickup/Usable1802-1808
    /code/branches/core3/src/orxonox/objects/pickup/Usable1572-1739
    /code/branches/gcc43/src/orxonox/objects/pickup/Usable1580
    /code/branches/gui/src/orxonox/objects/pickup/Usable1635-1723
    /code/branches/input/src/orxonox/objects/pickup/Usable1629-1636
    /code/branches/network/src/orxonox/objects/pickup/Usable.h2356
    /code/branches/network64/src/orxonox/objects/pickup/Usable.h2210-2355
    /code/branches/objecthierarchy2/src/orxonox/objects/pickup/Usable.h2171-2479
    /code/branches/overlay/src/orxonox/objects/pickup/Usable.h2117-2385
    /code/branches/physics/src/orxonox/objects/pickup/Usable.h2107-2439
    /code/branches/physics_merge/src/orxonox/objects/pickup/Usable.h2436-2457
    /code/branches/pickups/src/orxonox/objects/pickup/Usable.h2127
    /code/branches/pickups2/src/orxonox/objects/pickup/Usable.h2107-2497
    /code/branches/presentation/src/orxonox/objects/pickup/Usable.h2369-2652,​2654-2660
    /code/branches/questsystem2/src/orxonox/objects/pickup/Usable.h2107-2259
    /code/branches/weapon2/src/orxonox/objects/pickup/Usable.h2107-2488
File size: 242 bytes
Line 
1/*enum subItemType{ Subtypes (thrusters etc)*/
2
3namespace orxonox
4{
5    class _OrxonoxExport Usable: public ShipItem
6    {
7        public:
8            subtypeusable CheckSubType();
9        private:
10            subtypeusable subtype;
11    };
12}
Note: See TracBrowser for help on using the repository browser.