Changeset 1939 for code/branches/objecthierarchy/src/network

Timestamp:

Oct 18, 2008, 5:46:27 PM (16 years ago)

Author:

scheusso

Message:

forgot some things

Location:

code/branches/objecthierarchy/src/network

Files:

• ClientConnectionListener.cc (modified) (2 diffs)
• ClientConnectionListener.h (modified) (1 diff)
• Server.cc (modified) (4 diffs)

code/branches/objecthierarchy/src/network/ClientConnectionListener.cc

@@ -1 +1 @@
 #include "ClientConnectionListener.h"
 #include "core/CoreIncludes.h"
+#include "Settings.h"
 
 namespace network{
@@ -10 +11 @@
 
   void ClientConnectionListener::getConnectedClients(){
-    this->clientConnected(0); //server client id
+    if(orxonox::Settings::showsGraphics())
+      this->clientConnected(0); //server client id
     ClientInformation *client = ClientInformation::getBegin();
     while(client){

code/branches/objecthierarchy/src/network/ClientConnectionListener.h

@@ -10 +10 @@
   class _NetworkExport ClientConnectionListener : public orxonox::OrxonoxClass
   {
+  public:
     ClientConnectionListener();
 

code/branches/objecthierarchy/src/network/Server.cc

@@ -46 +46 @@
 
 #include "ConnectionManager.h"
+#include "ClientConnectionListener.h"
 #include "GamestateManager.h"
 #include "ClientInformation.h"
@@ -280 +281 @@
 
   bool Server::addClient(ENetEvent *event){
+    unsigned int newid=0;
+    
     ClientInformation *temp = ClientInformation::insertBack(new ClientInformation);
     if(!temp){
@@ -286 +289 @@
     }
     if(temp==ClientInformation::getBegin()) { //not good if you use anything else than insertBack
-      temp->setID(1);
+      newid=1;
     }
     else
-      temp->setID(temp->prev()->getID()+1);
+      newid=temp->prev()->getID()+1;
+    temp->setID(newid);
     temp->setPeer(event->peer);
+    
+    // inform all the listeners
+    orxonox::ObjectList<ClientConnectionListener>::iterator listener = orxonox::ObjectList<ClientConnectionListener>::begin();
+    while(listener){
+      listener->clientConnected(newid);
+    }
+    
     COUT(3) << "Server: added client id: " << temp->getID() << std::endl;
-    return createClient(temp->getID());
-  }
+    return createClient(temp->getID());  
+}
 
   bool Server::createClient(int clientID){
@@ -329 +340 @@
       return false;
     gamestates_->removeClient(client);
+
+// inform all the listeners
+    orxonox::ObjectList<ClientConnectionListener>::iterator listener = orxonox::ObjectList<ClientConnectionListener>::begin();
+    while(listener){
+      listener->clientDisconnected(client->getID());
+    }
+
     return ClientInformation::removeClient(event->peer);
   }