Maik JUSTUS: adapt some property names to match common style

[flightgear.git] / src / MultiPlayer / multiplaymgr.cxx

diff --git a/src/MultiPlayer/multiplaymgr.cxx b/src/MultiPlayer/multiplaymgr.cxx
index 53a6e1666bb21f8a5d754f68890af0f9c7668962..c18e461fc78e37e55358238d2e4993f401caca54 100644 (file)
--- a/src/MultiPlayer/multiplaymgr.cxx
+++ b/src/MultiPlayer/multiplaymgr.cxx
@@ -108,16 +108,33 @@ FGMultiplayMgr::sIdPropertyList[] = {
 
   {800, "rotors/main/rpm", SGPropertyNode::FLOAT},
   {801, "rotors/tail/rpm", SGPropertyNode::FLOAT},
-  {810, "rotors/main/blade1_pos",  SGPropertyNode::FLOAT},
-  {811, "rotors/main/blade2_pos",  SGPropertyNode::FLOAT},
-  {812, "rotors/main/blade3_pos",  SGPropertyNode::FLOAT},
-  {813, "rotors/main/blade4_pos",  SGPropertyNode::FLOAT},
-  {820, "rotors/main/blade1_flap",  SGPropertyNode::FLOAT},
-  {821, "rotors/main/blade2_flap",  SGPropertyNode::FLOAT},
-  {822, "rotors/main/blade3_flap",  SGPropertyNode::FLOAT},
-  {823, "rotors/main/blade4_flap",  SGPropertyNode::FLOAT},
-  {830, "rotors/tail/blade1_pos",  SGPropertyNode::FLOAT},
-  {831, "rotors/tail/blade2_pos",  SGPropertyNode::FLOAT},
+  {810, "rotors/main/blade[0]/position-deg",  SGPropertyNode::FLOAT},
+  {811, "rotors/main/blade[1]/position-deg",  SGPropertyNode::FLOAT},
+  {812, "rotors/main/blade[2]/position-deg",  SGPropertyNode::FLOAT},
+  {813, "rotors/main/blade[3]/position-deg",  SGPropertyNode::FLOAT},
+  {820, "rotors/main/blade[0]/flap-deg",  SGPropertyNode::FLOAT},
+  {821, "rotors/main/blade[1]/flap-deg",  SGPropertyNode::FLOAT},
+  {822, "rotors/main/blade[2]/flap-deg",  SGPropertyNode::FLOAT},
+  {823, "rotors/main/blade[3]/flap-deg",  SGPropertyNode::FLOAT},
+  {830, "rotors/tail/blade[0]/position-deg",  SGPropertyNode::FLOAT},
+  {831, "rotors/tail/blade[1]/position-deg",  SGPropertyNode::FLOAT},
+
+  {900, "sim/hitches/aerotow/tow/length",                       SGPropertyNode::FLOAT},
+  {901, "sim/hitches/aerotow/tow/elastic-constant",             SGPropertyNode::FLOAT},
+  {902, "sim/hitches/aerotow/tow/weight-per-m-kg-m",            SGPropertyNode::FLOAT},
+  {903, "sim/hitches/aerotow/tow/dist",                         SGPropertyNode::FLOAT},
+  {904, "sim/hitches/aerotow/tow/connected-to-property-node",   SGPropertyNode::BOOL},
+  {905, "sim/hitches/aerotow/tow/connected-to-ai-or-mp-callsign",   SGPropertyNode::STRING},
+  {906, "sim/hitches/aerotow/tow/brake-force",                  SGPropertyNode::FLOAT},
+  {907, "sim/hitches/aerotow/tow/end-force-x",                  SGPropertyNode::FLOAT},
+  {908, "sim/hitches/aerotow/tow/end-force-y",                  SGPropertyNode::FLOAT},
+  {909, "sim/hitches/aerotow/tow/end-force-z",                  SGPropertyNode::FLOAT},
+  {930, "sim/hitches/aerotow/is-slave",                         SGPropertyNode::BOOL},
+  {931, "sim/hitches/aerotow/speed-in-tow-direction",           SGPropertyNode::FLOAT},
+  {932, "sim/hitches/aerotow/open",                             SGPropertyNode::BOOL},
+  {933, "sim/hitches/aerotow/local-pos-x",                      SGPropertyNode::FLOAT},
+  {934, "sim/hitches/aerotow/local-pos-y",                      SGPropertyNode::FLOAT},
+  {935, "sim/hitches/aerotow/local-pos-z",                      SGPropertyNode::FLOAT},
 
   {1001, "controls/flight/slats",  SGPropertyNode::FLOAT},
   {1002, "controls/flight/speedbrake",  SGPropertyNode::FLOAT},
@@ -201,7 +218,6 @@ FGMultiplayMgr::init (void)
     return false;
   }
   mSocket->setBlocking(false);
-  mSocket->setBroadcast(true);
   if (mSocket->bind(rxAddress.c_str(), rxPort) != 0) {
     perror("bind");
     SG_LOG( SG_NETWORK, SG_ALERT,