Changeset 3093 for code/trunk

Timestamp:

May 27, 2009, 9:39:38 PM (16 years ago)

Author:

scheusso

Message:

it is now possible to send packets/network function calls to all clients by passing CLIENTID_UNKNOWN as clientID

Location:

code/trunk/src/network

Files:

• ConnectionManager.cc (modified) (2 diffs)
• ConnectionManager.h (modified) (1 diff)

code/trunk/src/network/ConnectionManager.cc

@@ -143 +143 @@
   }
 
-  bool ConnectionManager::addPacket(ENetPacket *packet, int clientID) {
-    ClientInformation *temp = ClientInformation::findClient(clientID);
-    if(!temp){
-      COUT(3) << "C.Man: addPacket findClient failed" << std::endl;
-      return false;
-    }
-    return addPacket(packet, temp->getPeer());
+  bool ConnectionManager::addPacket(ENetPacket *packet, unsigned int clientID) {
+    if ( clientID == CLIENTID_UNKNOWN )
+    {
+      return addPacketAll(packet);
+    }
+    else
+    {
+      ClientInformation *temp = ClientInformation::findClient(clientID);
+      if(!temp){
+        COUT(3) << "C.Man: addPacket findClient failed" << std::endl;
+        return false;
+      }
+      return addPacket(packet, temp->getPeer());
+    }
   }
 
@@ -156 +163 @@
       return false;
     boost::recursive_mutex::scoped_lock lock(enet_mutex_g);
-    for(ClientInformation *i=ClientInformation::getBegin()->next(); i!=0; i=i->next()){
-      COUT(3) << "adding broadcast packet for client: " << i->getID() << std::endl;
-      if(enet_peer_send(i->getPeer(), 0, packet)!=0)
-        return false;
-    }
+//    for(ClientInformation *i=ClientInformation::getBegin()->next(); i!=0; i=i->next()){
+//      COUT(3) << "adding broadcast packet for client: " << i->getID() << std::endl;
+//      if(enet_peer_send(i->getPeer(), 0, packet)!=0)
+//        return false;
+//    }
+    enet_host_broadcast( instance_->server, 0, packet);
     return true;
   }

code/trunk/src/network/ConnectionManager.h

@@ -76 +76 @@
     bool quitListener();
     static bool addPacket(ENetPacket *packet, ENetPeer *peer);
-    static bool addPacket(ENetPacket *packet, int ID);
+    static bool addPacket(ENetPacket *packet, unsigned int ID);
     static bool addPacketAll(ENetPacket *packet);
     bool sendPackets();