Changeset 11009 for code/trunk

Timestamp:

Dec 31, 2015, 2:23:59 PM (9 years ago)

Author:

landauf

Message:

merged single revision from cpp11_v2 to trunk to fix multiplayer

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/network/LANDiscoverable.cc (modified) (2 diffs)

code/trunk/src/libraries/network/LANDiscoverable.cc

@@ -44 +44 @@
   const char* LAN_DISCOVERY_ACK     = "Orxonox Server Ack";
 
-  LANDiscoverable::LANDiscoverable()
+  RegisterClassNoArgs(LANDiscoverable);
+
+  LANDiscoverable::LANDiscoverable() : bActive_(false), host_(0)
   {
     /* register object in orxonox */
@@ -50 +52 @@
 
     this->setConfigValues();
-    //     this->setActivity(true);
-    this->host_ = 0;
-    this->bActive_ = false;
   }