[Orxonox-commit 5797] r10457 - code/branches/multiplayerFS15/src/libraries/network

[frovelli at orxonox.net]

Author: frovelli
Date: 2015-05-23 21:50:13 +0200 (Sat, 23 May 2015)
New Revision: 10457

Modified:
   code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.cc
   code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.h
Log:
Remove training wheels

Modified: code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.cc
===================================================================
--- code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.cc	2015-05-23 19:47:30 UTC (rev 10456)
+++ code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.cc	2015-05-23 19:50:13 UTC (rev 10457)
@@ -119,7 +119,7 @@
             orxout(internal_info, context::network) << "Received LAN discovery message from client " << event.peer->host->receivedAddress << endl;
             packet::ServerInformation info;
             info.setServerName(this->ownName);
-            info.setClientNumber(5);
+            info.setClientNumber(this->clientNumber);
             info.send(event.peer);
 //             ENetPacket* packet = enet_packet_create( LAN_DISCOVERY_ACK, strlen(LAN_DISCOVERY_ACK)+1, ENET_PACKET_FLAG_RELIABLE );
 //             enet_peer_send(event.peer, 0, packet );

Modified: code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.h
===================================================================
--- code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.h	2015-05-23 19:47:30 UTC (rev 10456)
+++ code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.h	2015-05-23 19:50:13 UTC (rev 10457)
@@ -51,7 +51,7 @@
       bool            bActive_;
       ENetHost*       host_;
       std::string     ownName;
-      int clientNumber;
+      int             clientNumber;
   };
 
 }