Changeset 2087 for code/trunk/src/core/ConfigValueContainer.h

Timestamp:

Nov 1, 2008, 7:04:09 PM (17 years ago)

Author:

landauf

Message:

merged objecthierarchy branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/ConfigValueContainer.h (modified) (2 diffs)

code/trunk/src/core/ConfigValueContainer.h

@@ -52 +52 @@
 #include "util/MultiType.h"
 #include "ConfigFileManager.h"
+#include "Identifier.h"
 
 namespace orxonox
@@ -69 +70 @@
             inline virtual ~ConfigValueCallback() {}
             inline virtual void call(void* object)
-                { (((T*)object)->*this->function_)(); }
+                { if (!Identifier::isCreatingHierarchy()) { (((T*)object)->*this->function_)(); } }
 
         private: