Changeset 3256

Timestamp:

Jun 30, 2009, 2:44:06 PM (15 years ago)

Author:

scheusso

Message:

added NetworkFunctionBase::destroyAllNetworkFunctions to cleanup premain created stuff

Location:

code/branches/netp6/src

Files:

• network/NetworkFunction.cc (modified) (1 diff)
• network/NetworkFunction.h (modified) (1 diff)
• orxonox/gamestates/GSRoot.cc (modified) (2 diffs)

code/branches/netp6/src/network/NetworkFunction.cc

@@ -56 +56 @@
   
   
+  void NetworkFunctionBase::destroyAllNetworkFunctions()
+  {
+    std::map<std::string, NetworkFunctionBase*>::iterator it;
+    for( it=NetworkFunctionBase::nameMap_.begin(); it!=NetworkFunctionBase::nameMap_.end(); ++it )
+      delete it->second;
+  }
+  
   
   NetworkFunctionStatic::NetworkFunctionStatic(FunctorStatic* functor, const std::string& name, const NetworkFunctionPointer& p):

code/branches/netp6/src/network/NetworkFunction.h

@@ -80 +80 @@
     
     static inline void setNetworkID(const std::string& name, uint32_t id){ assert( nameMap_.find(name)!=nameMap_.end() ); nameMap_[name]->setNetworkID(id); }
+    
+    static void destroyAllNetworkFunctions();
     
   protected:

code/branches/netp6/src/orxonox/gamestates/GSRoot.cc

@@ -37 +37 @@
 #include "interfaces/TimeFactorListener.h"
 #include "interfaces/Tickable.h"
+#include "network/NetworkFunction.h"
 
 namespace orxonox
@@ -60 +61 @@
     GSRoot::~GSRoot()
     {
+        NetworkFunctionBase::destroyAllNetworkFunctions();
     }