Changeset 10470 for code/branches/core7/src/libraries/network/packet/FunctionIDs.cc

Timestamp:

May 25, 2015, 12:25:29 PM (9 years ago)

Author:

landauf

Message:

NetworkFunctionBase doesn't have to inherit from Listable: there's a list of all instances stored in NetworkFunctionManager stored anyway

File:

• code/branches/core7/src/libraries/network/packet/FunctionIDs.cc (modified) (1 diff)

code/branches/core7/src/libraries/network/packet/FunctionIDs.cc

@@ -56 +56 @@
 
   //calculate total needed size (for all strings and integers)
-  ObjectList<NetworkFunctionBase>::iterator it;
-  for(it = ObjectList<NetworkFunctionBase>::begin(); it; ++it)
+  std::map<std::string, NetworkFunctionBase*>& map = NetworkFunctionManager::getNameMap();
+  std::map<std::string, NetworkFunctionBase*>::iterator it;
+  for (it = map.begin(); it != map.end(); ++it)
   {
-    const std::string& functionname = it->getName();
-    networkID = it->getNetworkID();
+    const std::string& functionname = it->second->getName();
+    networkID = it->second->getNetworkID();
     // now push the network id and the classname to the stack
     tempQueue.push( std::pair<unsigned int, std::string>(networkID, functionname) );