Changeset 7851 for code/trunk/src/orxonox

Timestamp:

Feb 10, 2011, 11:34:20 PM (14 years ago)

Author:

landauf

Message:

added "safe mode" feature to FunctorMember: if enabled, the functor acts like a WeakPtr and sets the object-pointer to NULL if the object is deleted, hence the functor can not be executed anymore and instead prints an error message. safe mode is _disabled_ by default.

enabled safe mode for timers

To implement safe mode, FunctorMember<void> (= FunctorStatic) was spezialized and implemented differently. Additionally functors now work only with polymorphic objects due to a dynamic cast, hence XMLPortVariableHelperClass and Magazine got a virtual destructor.

File:

• code/trunk/src/orxonox/weaponsystem/Munition.h (modified) (1 diff)

code/trunk/src/orxonox/weaponsystem/Munition.h

@@ -45 +45 @@
             public:
                 Magazine(Munition* munition, bool bUseReloadTime = true);
+                virtual ~Magazine() {}
 
                 unsigned int munition_;