|
Last change
on this file since 2955 was
2710,
checked in by rgrieder, 16 years ago
|
|
Merged buildsystem3 containing buildsystem2 containing Adi's buildsystem branch back to the trunk.
Please update the media directory if you were not using buildsystem3 before.
|
-
Property svn:eol-style set to
native
-
Property svn:mergeinfo set to
(toggle deleted branches)
| /code/branches/lodfinal/src/orxonox/objects/pickup/Usable.h | merged | eligible | | /code/branches/buildsystem2/src/orxonox/objects/pickup/Usable.h | 2506-2658 | | /code/branches/buildsystem3/src/orxonox/objects/pickup/Usable.h | 2662-2708 | | /code/branches/ceguilua/src/orxonox/objects/pickup/Usable | 1802-1808 | | /code/branches/core3/src/orxonox/objects/pickup/Usable | 1572-1739 | | /code/branches/gcc43/src/orxonox/objects/pickup/Usable | 1580 | | /code/branches/gui/src/orxonox/objects/pickup/Usable | 1635-1723 | | /code/branches/input/src/orxonox/objects/pickup/Usable | 1629-1636 | | /code/branches/network/src/orxonox/objects/pickup/Usable.h | 2356 | | /code/branches/network64/src/orxonox/objects/pickup/Usable.h | 2210-2355 | | /code/branches/objecthierarchy2/src/orxonox/objects/pickup/Usable.h | 2171-2479 | | /code/branches/overlay/src/orxonox/objects/pickup/Usable.h | 2117-2385 | | /code/branches/physics/src/orxonox/objects/pickup/Usable.h | 2107-2439 | | /code/branches/physics_merge/src/orxonox/objects/pickup/Usable.h | 2436-2457 | | /code/branches/pickups/src/orxonox/objects/pickup/Usable.h | 2127 | | /code/branches/pickups2/src/orxonox/objects/pickup/Usable.h | 2107-2497 | | /code/branches/presentation/src/orxonox/objects/pickup/Usable.h | 2369-2652,2654-2660 | | /code/branches/questsystem2/src/orxonox/objects/pickup/Usable.h | 2107-2259 | | /code/branches/weapon2/src/orxonox/objects/pickup/Usable.h | 2107-2488 |
|
|
File size:
242 bytes
|
| Line | |
|---|
| 1 | /*enum subItemType{ Subtypes (thrusters etc)*/ |
|---|
| 2 | |
|---|
| 3 | namespace 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.
