Sync. w. JSBSim CVS

[flightgear.git] / src / Network / multiplay.cxx

diff --git a/src/Network/multiplay.cxx b/src/Network/multiplay.cxx
index 68072ae22195178c7af5e5e00e2e57d69567390b..cea4e8ab4d8ffb957c0db460fb738fc7da9f40e1 100644 (file)
--- a/src/Network/multiplay.cxx
+++ b/src/Network/multiplay.cxx
@@ -42,7 +42,7 @@
 
 #include "multiplay.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 
 // These constants are provided so that the ident command can list file versions.
@@ -101,13 +101,12 @@ bool FGMultiplay::open() {
     SGPropertyNode* root = globals->get_props();
 
     /// Build up the id to property map
-    unsigned i = 0;
-    while (FGMultiplayMgr::sIdPropertyList[i].name) {
+    
+    for (unsigned i = 0; i < FGMultiplayMgr::numProperties; ++i) {
       const char* name = FGMultiplayMgr::sIdPropertyList[i].name;
       SGPropertyNode* pNode = root->getNode(name);
       if (pNode)
         mPropertyMap[FGMultiplayMgr::sIdPropertyList[i].id] = pNode;
-      ++i;
     }
 
     return is_enabled();