Changeset 9906 in orxonox.OLD

Timestamp:

Oct 28, 2006, 10:40:56 PM (18 years ago)

Author:

rennerc

Message:

Return of the Network

Location:

branches/network/src/lib/network

Files:

• Makefile.am (modified) (2 diffs)
• message_manager.cc (modified) (1 diff)
• network_stream.cc (modified) (3 diffs)
• synchronizeable.cc (modified) (2 diffs)
• synchronizeable_var/synchronizeable_classid.cc (added)
• synchronizeable_var/synchronizeable_classid.h (added)

branches/network/src/lib/network/Makefile.am

@@ -43 +43 @@
                       synchronizeable_var/synchronizeable_uint.cc \
                       synchronizeable_var/synchronizeable_ip.cc \
+                      synchronizeable_var/synchronizeable_classid.cc \
                       \
                       ip.cc
@@ -94 +95 @@
                 synchronizeable_var/synchronizeable_uint.h \
                 synchronizeable_var/synchronizeable_ip.h \
+                synchronizeable_var/synchronizeable_classid.h \
                 \
                 ip.h

branches/network/src/lib/network/message_manager.cc

@@ -242 +242 @@
     assert( i + messageLength <= length );
     // make sure there is a message handler for this message type
-    if ( !( messageHandlerMap.find( (MessageType)messageType ) != messageHandlerMap.end()) )
-    {
-            PRINTF(0)("messagetype: %d\n", messageType);
-            this->objectList().debugAll( 0 );
-    }
+    //if ( !( messageHandlerMap.find( (MessageType)messageType ) != messageHandlerMap.end()) )
+    //{
+//          PRINTF(0)("messagetype: %d\n", messageType);
+//          this->objectList().debugAll( 0 );
+//    }
     
     assert( messageHandlerMap.find( (MessageType)messageType ) != messageHandlerMap.end());

branches/network/src/lib/network/network_stream.cc

@@ -1188 +1188 @@
           if( NullParent::staticClassID() == leafClassId || Synchronizeable::staticClassID() == leafClassId || NetworkGameManager::staticClassID() == leafClassId)
           {
-            PRINTF(1)("Don't create Object with ID %x, ignored!\n", (int)leafClassId);
+            PRINTF(0)("Don't create Object with ID %d, ignored!\n", (int)leafClassId);
             offset += syncDataLength;
             continue;
@@ -1194 +1194 @@
           else
             ; /// FIXME CLASS_ID :: b = Factory::fabricate( leafClassId );
-
+          b = Factory::fabricate( ObjectListBase::retrieveIdentity( leafClassId )  );
           if ( !b )
           {
-            PRINTF(1)("Could not fabricate Object with classID %x\n", leafClassId);
+            PRINTF(1)("Could not fabricate Object with classID %d\n", leafClassId);
             offset += syncDataLength;
             continue;
@@ -1208 +1208 @@
             sync->setSynchronized(true);
 
-            PRINTF(0)("Fabricated %s with id %d\n", sync->getClassCName(), sync->getUniqueID());
+            PRINTF(1)("Fabricated %s with id %d\n", sync->getClassCName(), sync->getUniqueID());
           }
           else
           {
-            PRINTF(1)("Class with ID %x is not a synchronizeable!\n", (int)leafClassId);
+            PRINTF(1)("Class with ID %d is not a synchronizeable!\n", (int)leafClassId);
             delete b;
             offset += syncDataLength;

branches/network/src/lib/network/synchronizeable.cc

@@ -30 +30 @@
 
 #include "converter.h"
+
+#include "synchronizeable_var/synchronizeable_classid.h"
 
 
@@ -57 +59 @@
   assert( syncVarList.size() == 0 );
   assert( this->getClassID() == this->objectList().id() );
-  mLeafClassId = this->registerVarId( new SynchronizeableInt( (int*)&leafClassID, (int*)&leafClassID, "leafClassId", PERMISSION_MASTER_SERVER) );
+  
+  mLeafClassId = this->registerVarId( new SynchronizeableClassID( this, "leafClassId", PERMISSION_MASTER_SERVER) );
 
   this->registerVar( new SynchronizeableInt( &this->owner, &this->owner, "owner", PERMISSION_MASTER_SERVER ) );