Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9906 in orxonox.OLD for branches


Ignore:
Timestamp:
Oct 28, 2006, 10:40:56 PM (18 years ago)
Author:
rennerc
Message:

Return of the Network :D

Location:
branches/network/src/lib/network
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/network/src/lib/network/Makefile.am

    r9656 r9906  
    4343                      synchronizeable_var/synchronizeable_uint.cc \
    4444                      synchronizeable_var/synchronizeable_ip.cc \
     45                      synchronizeable_var/synchronizeable_classid.cc \
    4546                      \
    4647                      ip.cc
     
    9495                synchronizeable_var/synchronizeable_uint.h \
    9596                synchronizeable_var/synchronizeable_ip.h \
     97                synchronizeable_var/synchronizeable_classid.h \
    9698                \
    9799                ip.h
  • branches/network/src/lib/network/message_manager.cc

    r9901 r9906  
    242242    assert( i + messageLength <= length );
    243243    // make sure there is a message handler for this message type
    244     if ( !( messageHandlerMap.find( (MessageType)messageType ) != messageHandlerMap.end()) )
    245     {
    246             PRINTF(0)("messagetype: %d\n", messageType);
    247             this->objectList().debugAll( 0 );
    248     }
     244    //if ( !( messageHandlerMap.find( (MessageType)messageType ) != messageHandlerMap.end()) )
     245    //{
     246//          PRINTF(0)("messagetype: %d\n", messageType);
     247//          this->objectList().debugAll( 0 );
     248//    }
    249249   
    250250    assert( messageHandlerMap.find( (MessageType)messageType ) != messageHandlerMap.end());
  • branches/network/src/lib/network/network_stream.cc

    r9869 r9906  
    11881188          if( NullParent::staticClassID() == leafClassId || Synchronizeable::staticClassID() == leafClassId || NetworkGameManager::staticClassID() == leafClassId)
    11891189          {
    1190             PRINTF(1)("Don't create Object with ID %x, ignored!\n", (int)leafClassId);
     1190            PRINTF(0)("Don't create Object with ID %d, ignored!\n", (int)leafClassId);
    11911191            offset += syncDataLength;
    11921192            continue;
     
    11941194          else
    11951195            ; /// FIXME CLASS_ID :: b = Factory::fabricate( leafClassId );
    1196 
     1196          b = Factory::fabricate( ObjectListBase::retrieveIdentity( leafClassId )  );
    11971197          if ( !b )
    11981198          {
    1199             PRINTF(1)("Could not fabricate Object with classID %x\n", leafClassId);
     1199            PRINTF(1)("Could not fabricate Object with classID %d\n", leafClassId);
    12001200            offset += syncDataLength;
    12011201            continue;
     
    12081208            sync->setSynchronized(true);
    12091209
    1210             PRINTF(0)("Fabricated %s with id %d\n", sync->getClassCName(), sync->getUniqueID());
     1210            PRINTF(1)("Fabricated %s with id %d\n", sync->getClassCName(), sync->getUniqueID());
    12111211          }
    12121212          else
    12131213          {
    1214             PRINTF(1)("Class with ID %x is not a synchronizeable!\n", (int)leafClassId);
     1214            PRINTF(1)("Class with ID %d is not a synchronizeable!\n", (int)leafClassId);
    12151215            delete b;
    12161216            offset += syncDataLength;
  • branches/network/src/lib/network/synchronizeable.cc

    r9901 r9906  
    3030
    3131#include "converter.h"
     32
     33#include "synchronizeable_var/synchronizeable_classid.h"
    3234
    3335
     
    5759  assert( syncVarList.size() == 0 );
    5860  assert( this->getClassID() == this->objectList().id() );
    59   mLeafClassId = this->registerVarId( new SynchronizeableInt( (int*)&leafClassID, (int*)&leafClassID, "leafClassId", PERMISSION_MASTER_SERVER) );
     61 
     62  mLeafClassId = this->registerVarId( new SynchronizeableClassID( this, "leafClassId", PERMISSION_MASTER_SERVER) );
    6063
    6164  this->registerVar( new SynchronizeableInt( &this->owner, &this->owner, "owner", PERMISSION_MASTER_SERVER ) );
Note: See TracChangeset for help on using the changeset viewer.