Changeset 10612 for code/branches/presentationFS15merge/src/libraries/network/PeerList.cc

Timestamp:

Oct 4, 2015, 12:13:42 PM (9 years ago)

Author:

landauf

Message:

merged branch multiplayerFS15

Location:

code/branches/presentationFS15merge

Files:

• . (modified) (1 prop)
• src/libraries/network/PeerList.cc (modified) (6 diffs)

code/branches/presentationFS15merge/src/libraries/network/PeerList.cc

@@ -38 +38 @@
   PeerList::~PeerList() { }
 
-  int 
+  int
   PeerList::addPeer( ENetPeer *toadd )
   { /* error correction */
-    if( toadd == NULL ) 
+    if( toadd == NULL )
     { orxout(internal_error, context::master_server) << "PeerList::addPeer: empty peer given." << endl;
       return -1;
@@ -52 +52 @@
 
   bool sub_compAddr( ENetAddress addr1, ENetAddress addr2 )
-  { 
+  {
     for( int i = 0; i < 16; ++i )
       if( addr1.host.addr[i] < addr2.host.addr[i] )
@@ -61 +61 @@
     return 0;
   }
-    
+
 
   bool
@@ -69 +69 @@
 
     /* loop through list elements */
-    for( i = peerlist.begin(); i != peerlist.end(); ++i ) 
+    for( i = peerlist.begin(); i != peerlist.end(); ++i )
       if( !sub_compAddr((*i)->address, addr ) )
       { /* found this name, remove and quit */
@@ -86 +86 @@
 
     /* loop through list elements */
-    for( i = peerlist.begin(); i != peerlist.end(); ++i ) 
+    for( i = peerlist.begin(); i != peerlist.end(); ++i )
       if( !sub_compAddr((*i)->address, addr ) )
         /* found this name, remove and quit */
@@ -95 +95 @@
   }
 
+  int
+  PeerList::count(){
+    return this->peerlist.size();
+  }
+
 }
-