Changeset 9901 in orxonox.OLD
- Timestamp:
- Oct 26, 2006, 5:54:19 PM (18 years ago)
- Location:
- branches/network/src/lib
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/network/src/lib/graphics/shader_data.cc
r9869 r9901 63 63 { 64 64 PRINTF(2)("Shaders are not supported on your hardware\n"); 65 } 65 return true; 66 } 67 68 return true; 66 69 } 67 70 -
branches/network/src/lib/lang/base_object.h
r9869 r9901 71 71 protected: 72 72 std::string objectName; //!< The name of this object 73 ClassID leafClassID; //!< classId of leaf class 73 74 74 75 private: … … 107 108 { 108 109 this->_classes.push_front(ClassEntry(&objectList, objectList.registerObject(object))); 110 this->leafClassID = object->getClassID(); 109 111 } 110 112 -
branches/network/src/lib/network/handshake.h
r9869 r9901 113 113 int errorString_handler; //!< handshake error string handler 114 114 int candel_id; //!< handshake deletion handler 115 int nodeType; //! ,the type of the network node115 int nodeType; //!< the type of the network node 116 116 117 117 int redirectProxy; //!< true if the client should reconnect to a proxy server -
branches/network/src/lib/network/message_manager.cc
r9869 r9901 242 242 assert( i + messageLength <= length ); 243 243 // 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 244 250 assert( messageHandlerMap.find( (MessageType)messageType ) != messageHandlerMap.end()); 245 251 -
branches/network/src/lib/network/peer_info.h
r9656 r9901 36 36 int userId; //!< id of this network node 37 37 int nodeType; //!< type of this network node 38 IP ip; //! >the ip address of this network node38 IP ip; //!< the ip address of this network node 39 39 40 40 NetworkSocket * socket; //!< socket connecting to this node -
branches/network/src/lib/network/synchronizeable.cc
r9869 r9901 56 56 /* make sure loadClassId is first synced var because this is read by networkStream */ 57 57 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) ); 59 60 60 61 this->registerVar( new SynchronizeableInt( &this->owner, &this->owner, "owner", PERMISSION_MASTER_SERVER ) );
Note: See TracChangeset
for help on using the changeset viewer.