Changeset 636

Timestamp:

Dec 19, 2007, 1:38:19 AM (16 years ago)

Author:

scheusso

Message:

synchronising of classid↔classname works now

Location:

code/branches/FICN/src/network

Files:

• ClientInformation.cc (modified) (3 diffs)
• ClientInformation.h (modified) (2 diffs)
• ConnectionManager.cc (modified) (2 diffs)
• GameStateClient.cc (modified) (1 diff)
• PacketDecoder.cc (modified) (1 diff)
• PacketGenerator.cc (modified) (1 diff)
• Server.cc (modified) (1 diff)

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

@@ -47 +47 @@
   nexte=0;
   this->head=false;
+  synched_=false;
 }
 
@@ -55 +56 @@
   nexte=0;
   this->head=head;
+  synched_=false;
 }
 //
@@ -220 +222 @@
 }
 
-}
+void ClientInformation::setSynched(bool s){
+  synched_=s;
+}
+bool ClientInformation::getSynched(){
+  return synched_;
+}
+
+}

code/branches/FICN/src/network/ClientInformation.h

@@ -48 +48 @@
   ClientInformation *findClient(int clientID, bool look_backwards=false);
   ClientInformation *findClient(ENetAddress *address, bool look_backwards=false);
+  
+  void setSynched(bool s);
+  bool getSynched();
+  
   bool head;
   
@@ -57 +61 @@
   int clientID_;
   int gamestateID_;
+  bool synched_;
 };
 

code/branches/FICN/src/network/ConnectionManager.cc

@@ -233 +233 @@
       temp->setID(temp->prev()->getID()+1);
     temp->setPeer(event->peer);
-    std::cout << "added client id: " << temp->prev()->getID() << std::endl;
+    std::cout << "added client id: " << temp->getID() << std::endl;
+    syncClassid(temp->getID());
+    temp->setSynched(true);
     return true;
   }
@@ -256 +258 @@
     while(!abort){
       id = ID(i);
-      if(id == NULL)
-        abort=true;
+      std::cout << "syncid: " << i << ", ID(id): " << id << std::endl;
+      if(id == NULL){
+        if(i!=0)
+          abort=true;
+        else{
+          ++i;
+          continue;
+        }
+      }
       else{
         classname = id->getName();

code/branches/FICN/src/network/GameStateClient.cc

@@ -88 +88 @@
       }
       if(it==0){
+        std::cout << "classid: " << sync.classID << ", name: " << ID(sync.classID)->getName() << std::endl;
         orxonox::BaseObject *no = ID(sync.classID)->fabricate();
         ((Synchronisable *)no)->objectID=sync.objectID;

code/branches/FICN/src/network/PacketDecoder.cc

@@ -186 +186 @@
         cid->clid = ((classid *)(packet->data))->clid;
         cid->message = (const char *)malloc(cid->length);
+        void *data  = (void *)cid->message;
+        memcpy(data, (const void*)(packet->data+3*sizeof(int)), cid->length);
+        std::cout << "classid: " << cid->clid << ", name: " << cid->message << std::endl;
         enet_packet_destroy( packet );
         processClassid(cid);

code/branches/FICN/src/network/PacketGenerator.cc

@@ -128 +128 @@
 ENetPacket* PacketGenerator::clid( int classid, std::string classname, int reliable ){
         unsigned char* data = (unsigned char *)malloc(3*sizeof(int)+classname.length()+1);
+        std::cout << "classid: " << classid << ", name: " << classname << std::endl;
         *(int *)data = CLASSID;
         *((int *)data+1) = classname.length()+1;

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

@@ -142 +142 @@
         continue;
       }
+      if( !(temp->getSynched()) ){
+        std::cout << "not sending gamestate" << std::endl;
+        temp=temp->next();
+        continue;
+      }
       std::cout << "doing gamestate" << std::endl;
       int gid = temp->getGamestateID();