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

Timestamp:

Nov 4, 2008, 9:53:12 PM (15 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.cc (modified) (1 diff)

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

@@ -5 +5 @@
     itemtype ShipItem::CheckType()
     {
-        return this.type;
+        return this->type;
     }
 
     subItemTypePermanent CheckSubType()
     {
-        return this.subtype_permanent;
+        return this->subtype_permanent;
     }
+
+    subItemTypePowerups CheckSubType()
+    {
+        return this->subtype_powerups;
+    }
+    subItemTypeUsable CheckSubType()
+    {
+        return this->subtype_usables;
+    }
+
 }