Changeset 7294

Timestamp:

Aug 31, 2010, 6:13:18 PM (14 years ago)

Author:

adrfried

Message:

made enet 1.3 compatible

Location:

code/branches/ipv6/src/libraries/network

Files:

• ClientConnection.cc (modified) (2 diffs)
• LANDiscoverable.cc (modified) (1 diff)
• LANDiscovery.cc (modified) (2 diffs)
• ServerConnection.cc (modified) (1 diff)

code/branches/ipv6/src/libraries/network/ClientConnection.cc

@@ -70 +70 @@
     ENetEvent event;
 
-    this->host_ = enet_host_create(NULL, NETWORK_CLIENT_MAX_CONNECTIONS, 0, 0);
+    this->host_ = enet_host_create(NULL, NETWORK_CLIENT_MAX_CONNECTIONS, 0, 0, 0);
     if ( this->host_ == NULL )
     {
@@ -77 +77 @@
       return false;
     }
-    this->server_ = enet_host_connect(this->host_, serverAddress_, NETWORK_CLIENT_CHANNELS);
+    this->server_ = enet_host_connect(this->host_, serverAddress_, NETWORK_CLIENT_CHANNELS, 0);
     if ( this->server_==NULL )
     {

code/branches/ipv6/src/libraries/network/LANDiscoverable.cc

@@ -66 +66 @@
       ENetAddress bindAddress = { ENET_HOST_ANY, LAN_DISCOVERY_PORT };
       assert( this->host_ == 0 );
-      this->host_ = enet_host_create( &bindAddress, 10, 0, 0 );
+      this->host_ = enet_host_create( &bindAddress, 10, 0, 0, 0 );
     }
     else

code/branches/ipv6/src/libraries/network/LANDiscovery.cc

@@ -42 +42 @@
   LANDiscovery::LANDiscovery()
   {
-    this->host_ = enet_host_create(NULL, 10, 0, 0 );
+    this->host_ = enet_host_create(NULL, 10, 0, 0, 0 );
   }
 
@@ -58 +58 @@
 
     ENetPeer* peer;
-    peer = enet_host_connect(this->host_, &address, 0);
+    peer = enet_host_connect(this->host_, &address, 0, 0);
 
     ENetEvent event;

code/branches/ipv6/src/libraries/network/ServerConnection.cc

@@ -63 +63 @@
 
   bool ServerConnection::openListener() {
-    this->host_ = enet_host_create(this->bindAddress_, NETWORK_MAX_CONNECTIONS, 0, 0);
+    this->host_ = enet_host_create(this->bindAddress_, NETWORK_MAX_CONNECTIONS, 0, 0, 0);
     if ( this->host_ == NULL )
       return false;