Changeset 3366 for code/branches/resource/src/orxonox/objects/pickup

Timestamp:

Jul 29, 2009, 10:27:10 PM (15 years ago)

Author:

rgrieder

Message:

Derived all singletons implemented in a usual manner from orxonox::Singleton<T>.
This resolves inconsistencies with the singletonPtr_s variable in case of exceptions (asserts were being triggered then).
And while at it replaced singletonRef_s with singletonPtr_s for it to be less misleading (as fabian has already pointed out).

Location:

code/branches/resource/src/orxonox/objects/pickup

Files:

• BaseItem.h (modified) (1 diff)
• PickupInventory.h (modified) (1 diff)

code/branches/resource/src/orxonox/objects/pickup/BaseItem.h

@@ -51 +51 @@
             Daniel 'Huty' Haggenmueller
     */
-    class _OrxonoxExport BaseItem
-// tolua_end
-        : public BaseObject
-// tolua_begin
+    class _OrxonoxExport BaseItem : public BaseObject
     {
 // tolua_end

code/branches/resource/src/orxonox/objects/pickup/PickupInventory.h

@@ -43 +43 @@
 namespace orxonox
 {
-// tolua_end
     /**
         @brief Static class for the inventory GUI window.
         @author Daniel 'Huty' Haggenmueller
     */
-// tolua_begin
     class _OrxonoxExport PickupInventory
     {