Changeset 1952

Timestamp:

Oct 19, 2008, 8:42:39 PM (16 years ago)

Author:

scheusso

Message:

-fixed a compiler error
-fixed a problem with multiple clients connected

Location:

code/branches/objecthierarchy/src

Files:

• core/Identifier.h (modified) (1 diff)
• network/ClientInformation.cc (modified) (1 diff)
• network/Server.cc (modified) (3 diffs)
• network/packet/Packet.cc (modified) (1 diff)

code/branches/objecthierarchy/src/core/Identifier.h

@@ -61 +61 @@
 #include <typeinfo>
 #include <stdlib.h>
+#include <cassert>
 
 #include "MetaObjectList.h"

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

@@ -185 +185 @@
   ClientInformation *ClientInformation::insertBack(ClientInformation *ins) {
     ClientInformation *temp = head_;
-    if(temp==head_){
+    if(temp==ins){
       return head_;
     }

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

@@ -282 +282 @@
 
   bool Server::addClient(ENetEvent *event){
-    unsigned int newid=0;
-
+    static unsigned int newid=1;
+
+    COUT(2) << "Server: adding client" << std::endl;
     ClientInformation *temp = ClientInformation::insertBack(new ClientInformation);
     if(!temp){
@@ -289 +290 @@
       return false;
     }
-    if(temp==ClientInformation::getBegin()) { //not good if you use anything else than insertBack
+    /*if(temp==ClientInformation::getBegin()) { //not good if you use anything else than insertBack
       newid=1;
     }
     else
-      newid=temp->prev()->getID()+1;
+      newid=temp->prev()->getID()+1;*/
     temp->setID(newid);
     temp->setPeer(event->peer);
@@ -303 +304 @@
       listener++;
     }
+    
+    newid++;
 
     COUT(3) << "Server: added client id: " << temp->getID() << std::endl;

code/branches/objecthierarchy/src/network/packet/Packet.cc

@@ -135 +135 @@
 Packet *Packet::createPacket(ENetPacket *packet, ENetPeer *peer){
   uint8_t *data = packet->data;
+  assert(ClientInformation::findClient(&peer->address)->getID()!=-2 || !Host::isServer());
   unsigned int clientID = ClientInformation::findClient(&peer->address)->getID();
   Packet *p;