Changeset 8866

Timestamp:

Aug 24, 2011, 3:28:55 PM (13 years ago)

Author:

dafrick

Message:

Moved clone base method into Pickupable to avoid ambiguity.

Location:

code/trunk/src

Files:

• libraries/core/OrxonoxClass.h (modified) (2 diffs)
• libraries/core/Super.h (modified) (1 diff)
• orxonox/interfaces/Pickupable.cc (modified) (1 diff)
• orxonox/interfaces/Pickupable.h (modified) (2 diffs)

code/trunk/src/libraries/core/OrxonoxClass.h

@@ -115 +115 @@
             bool isDirectParentOf(const OrxonoxClass* object);
 
-            virtual void clone(OrxonoxClass*& item) {}
-
             /// Returns the number of @ref orxonox::SmartPtr "smart pointers" that point to this object.
             inline unsigned int getReferenceCount() const
@@ -197 +195 @@
     };
 
-    SUPER_FUNCTION(11, OrxonoxClass, clone, false);
 }
 

code/trunk/src/libraries/core/Super.h

@@ -566 +566 @@
         SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
 
-        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(11, clone, true, OrxonoxClass* item)
+        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(11, clone, true, OrxonoxClass*& item)
             (item)
         SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;

code/trunk/src/orxonox/interfaces/Pickupable.cc

@@ -346 +346 @@
     /**
     @brief
-        Creates a duplicate of the input OrxonoxClass.
-        This method needs to be implemented by any Class inheriting from Pickupable.
-    @param item
-        A reference to a pointer to the OrxonoxClass that is to be duplicated.
-    */
-    void Pickupable::clone(OrxonoxClass*& item)
-    {
-        SUPER(Pickupable, clone, item);
-    }
-
-    /**
-    @brief
         Method to transcribe a Pickupable as a Rewardable to the player.
     @param player

code/trunk/src/orxonox/interfaces/Pickupable.h

@@ -137 +137 @@
 
             Pickupable* clone(void); //!< Creates a duplicate of the Pickupable.
-            virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
+            /**
+            @brief Creates a duplicate of the input OrxonoxClass.
+                   This method needs to be implemented by any Class inheriting from Pickupable.
+            @param item A reference to a pointer to the OrxonoxClass that is to be duplicated.
+            */
+            virtual void clone(OrxonoxClass*& item) {}
 
             /**
@@ -200 +205 @@
     SUPER_FUNCTION(12, Pickupable, changedCarrier, false);
     SUPER_FUNCTION(13, Pickupable, changedPickedUp, false);
+    SUPER_FUNCTION(11, Pickupable, clone, false);
 }