Changeset 2083

Timestamp:

Nov 1, 2008, 2:38:21 PM (16 years ago)

Author:

landauf

Message:

made some small adjustments in Pickups branch

Location:

code/branches/pickups/src/orxonox/objects/pickup

Files:

• ShipEquipment.h (modified) (2 diffs)
• ShipEquipmentClasses.h (modified) (2 diffs)
• ShipItem.cc (modified) (1 diff)
• ShipItem.h (modified) (4 diffs)
• Usable.h (moved) (moved from code/branches/pickups/src/orxonox/objects/pickup/Usable) (1 diff, 1 prop)

code/branches/pickups/src/orxonox/objects/pickup/ShipEquipment.h

@@ -11 +11 @@
 
 
-namespaces orxonox{
+namespace orxonox{
 
         class _OrxonoxExport ShipEquipment{
@@ -21 +21 @@
         private:
                 std::multimap<std::string, Item*> Equipment;
+        };
+}
 
 

code/branches/pickups/src/orxonox/objects/pickup/ShipEquipmentClasses.h

@@ -15 +15 @@
                 EQClasses["jacke"] = 0;
             Item* item = itemMap_["jacke"];
-           
+
            if (itemMap_["jacke"])
            if (itemMap_.find("jacke") != itemMap_.end()) */
-namespaces orxonox{
-        
+namespace orxonox{
+
         class _OrxonoxExport ShipEquipment{
         public:
@@ -30 +30 @@
                 multimap<std::string, ShipItem*> Usable;
                 multimap<std::string, ShipItem*> Trunk;
-        
+        };
 
 

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

@@ -1 +1 @@
 #include "Shipitem.h"
 
+namespace orxonox
+{
+    itemtype ShipItem::CheckType()
+    {
+        return this.type;
+    }
 
-itemtype CheckType(){
-        return This.type};
-        
-subItemTypePermanent CheckSubType(){
-        return This.subtype_permanent};
-        
+    subItemTypePermanent CheckSubType()
+    {
+        return this.subtype_permanent;
+    }
+}

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

@@ -9 +9 @@
 
 namespace orxonox{
-Class _OrxonoxExport ShipItem{
+class _OrxonoxExport ShipItem{
 
         enum itemType{ //Diffrent Types of Items
@@ -30 +30 @@
 /* Useables are Items the Player can choose when to activate and then show an instant action/effect
  * or for a certain duration */
-Class _OrxonoxExport Useable : public ShipItem{
+class _OrxonoxExport Useable : public ShipItem{
 
 
@@ -51 +51 @@
 /* Permanents are Items, that effect the Player or his Ship from the instance he picks them up
    until he drops them again */
-Class _OrxonoxExport Permanent : public ShipItem{
+class _OrxonoxExport Permanent : public ShipItem{
 
         enum subItemTypePermanent{ //Diffrent Types of Items of the Type Permanent
@@ -67 +67 @@
 
 // Powerups effect the Player right after he picks them up for a certain Duration /or permanently.
-Class _OrxonoxExport Powerups : public ShipItem{
+class _OrxonoxExport Powerups : public ShipItem{
 
         enum subItem TypePowerups{ //Diffrent Types of Items of the Type Powerups

code/branches/pickups/src/orxonox/objects/pickup/Usable.h

@@ -3 +3 @@
 namespace orxonox{
         class _OrxonoxExport Usable: public ShipItem{
-        
+
         public:
         subtypeusable CheckSubType();
         private:
         subtypeusable subtype;
-                
-        }
+
+        };
+}