Changeset 11323 for code/branches/HUD_HS16/src/orxonox/interfaces/Pickupable.h

Timestamp:

Dec 5, 2016, 6:01:02 PM (7 years ago)

Author:

patricwi

Message:

bug when ending or restarting a game with non-empty inventory and size and address of pickups still has to be specified so that the item corresponds to the right pickup symbol

File:

• code/branches/HUD_HS16/src/orxonox/interfaces/Pickupable.h (modified) (2 diffs)

code/branches/HUD_HS16/src/orxonox/interfaces/Pickupable.h

@@ -96 +96 @@
 
             /**
+            @brief Check whether the Pickupable is in the process of being destroyed.
+            @return Returns true if so.
+            */
+            inline bool isBeingDestroyed(void)
+                { return this->beingDestroyed_; }
+                
+            /**
             @brief Returns whether the Pickupable is currently picked up.
             @return Returns true if the Pickupable is currently picked up, false if not.
@@ -155 +162 @@
 
             /**
-            @brief Check whether the Pickupable is in the process of being destroyed.
-            @return Returns true if so.
-            */
-            inline bool isBeingDestroyed(void)
-                { return this->beingDestroyed_; }
-
-            /**
             @brief Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
                    This method must be implemented by any class directly inheriting from Pickupable.