Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9901 in orxonox.OLD


Ignore:
Timestamp:
Oct 26, 2006, 5:54:19 PM (18 years ago)
Author:
rennerc
Message:

link error

Location:
branches/network/src/lib
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/network/src/lib/graphics/shader_data.cc

    r9869 r9901  
    6363  {
    6464    PRINTF(2)("Shaders are not supported on your hardware\n");
    65   }
     65    return true;
     66  }
     67 
     68  return true;
    6669}
    6770
  • branches/network/src/lib/lang/base_object.h

    r9869 r9901  
    7171protected:
    7272  std::string        objectName;       //!< The name of this object
     73  ClassID            leafClassID;      //!< classId of leaf class
    7374
    7475private:
     
    107108{
    108109  this->_classes.push_front(ClassEntry(&objectList, objectList.registerObject(object)));
     110  this->leafClassID = object->getClassID();
    109111}
    110112
  • branches/network/src/lib/network/handshake.h

    r9869 r9901  
    113113    int                errorString_handler;                   //!< handshake error string handler
    114114    int                candel_id;                             //!< handshake deletion handler
    115     int                nodeType;                              //!, the type of the network node
     115    int                nodeType;                              //!< the type of the network node
    116116
    117117    int                redirectProxy;                         //!< true if the client should reconnect to a proxy server
  • branches/network/src/lib/network/message_manager.cc

    r9869 r9901  
    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    }
     249   
    244250    assert( messageHandlerMap.find( (MessageType)messageType ) != messageHandlerMap.end());
    245251
  • branches/network/src/lib/network/peer_info.h

    r9656 r9901  
    3636    int                 userId;                  //!< id of this network node
    3737    int                 nodeType;                //!< type of this network node
    38     IP                  ip;                      //!> the ip address of this network node
     38    IP                  ip;                      //!< the ip address of this network node
    3939
    4040    NetworkSocket *     socket;                  //!< socket connecting to this node
  • branches/network/src/lib/network/synchronizeable.cc

    r9869 r9901  
    5656  /* make sure loadClassId is first synced var because this is read by networkStream */
    5757  assert( syncVarList.size() == 0 );
    58   mLeafClassId = this->registerVarId( new SynchronizeableInt( (int*)&this->getLeafClassID(), (int*)&this->getLeafClassID(), "leafClassId", PERMISSION_MASTER_SERVER) );
     58  assert( this->getClassID() == this->objectList().id() );
     59  mLeafClassId = this->registerVarId( new SynchronizeableInt( (int*)&leafClassID, (int*)&leafClassID, "leafClassId", PERMISSION_MASTER_SERVER) );
    5960
    6061  this->registerVar( new SynchronizeableInt( &this->owner, &this->owner, "owner", PERMISSION_MASTER_SERVER ) );
Note: See TracChangeset for help on using the changeset viewer.