Changeset 401

Timestamp:

Dec 5, 2007, 4:10:19 PM (17 years ago)

Author:

scheusso

Message:

corrected some errors

Location:

code/branches/FICN

Files:

• CMakeLists.txt (modified) (1 diff)
• src/network/Client.cc (modified) (1 diff)
• src/network/ConnectionManager.cc (modified) (1 diff)
• src/network/PacketDecoder.cc (modified) (1 diff)
• src/network/PacketManager.h (modified) (2 diffs)
• src/network/Synchronisable.cc (modified) (1 diff)

code/branches/FICN/CMakeLists.txt

@@ -63 +63 @@
 FIND_PACKAGE(OpenAL)
 FIND_PACKAGE(ALUT)
-# FIND_PACKAGE(OggVorbis)
+#FIND_PACKAGE(OggVorbis)
 
 #Sets the search paths for the linking

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

@@ -155 +155 @@
   
   void Client::processClassid(classid *clid){
-    
-    
-    
+    orxonox::Identifier *id;
+    orxonox::ID(std::string(clid->message))->setNetworkID(clid->classid);
   }
   

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

@@ -231 +231 @@
         addPacket(packet_gen.clid( i, classname ),clientID);
       }
+      ++i;
     }
     sendPackets();

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

@@ -138 +138 @@
         cid->message = (const char *)malloc(cid->length);
         enet_packet_destroy( packet );
-        processClassid(&cid);
+        processClassid(cid);
 }
 

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

@@ -66 +66 @@
         //call this function to decode, it calls the right decoding function below
         bool elaborate( ENetPacket* packet, int clientId );
+        struct classid{
+          int id;
+          int length;
+          int classid;
+          const char *message;
+        };
 private:
         struct ack {
@@ -89 +95 @@
         };
         
-        struct classid{
-          int id;
-          int length;
-          int classid;
-          const char *message;
-        };
+        
         
         void acknowledgement( ENetPacket* packet );

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

@@ -20 +20 @@
 Synchronisable::Synchronisable()
 {
+  static int idCounter=0;
   datasize=0;
+  objectID=idCounter++;
   //registerAllVariables();
 }