Changeset 2136 for code/branches/pickups2/src/orxonox/objects/pickup/ShipItem.h

Timestamp:

Nov 4, 2008, 9:53:12 PM (17 years ago)

Author:

landauf

Message:

merged changes from pickups1 to pickups2, not merged (probably) accidentally added files

Location:

code/branches/pickups2

Files:

• . (modified) (1 prop)
• src/orxonox/objects/pickup/ShipItem.h (modified) (3 diffs)

code/branches/pickups2/src/orxonox/objects/pickup/ShipItem.h

@@ -21 +21 @@
         public:
             itemType CheckType();
-            virtual
+            //virtual ChecksubType();
 
         private:
@@ -27 +27 @@
             string itemname;
     };
-
 
     /* Useables are Items the Player can choose when to activate and then show an instant action/effect
@@ -37 +36 @@
             Rockets,
             Repairkits,
-            Triggers,           //trigger events usable by the player (Quests f.exp.)
+            Triggers,       //trigger events usable by the player (Quests f.exp.)
             Boosters,
             Shields,