Changeset 9901 in orxonox.OLD

Timestamp:

Oct 26, 2006, 5:54:19 PM (17 years ago)

Author:

rennerc

Message:

link error

Location:

branches/network/src/lib

Files:

• graphics/shader_data.cc (modified) (1 diff)
• lang/base_object.h (modified) (2 diffs)
• network/handshake.h (modified) (1 diff)
• network/message_manager.cc (modified) (1 diff)
• network/peer_info.h (modified) (1 diff)
• network/synchronizeable.cc (modified) (1 diff)

branches/network/src/lib/graphics/shader_data.cc

@@ -63 +63 @@
   {
     PRINTF(2)("Shaders are not supported on your hardware\n");
-  }
+    return true;
+  }
+  
+  return true;
 }
 

branches/network/src/lib/lang/base_object.h

@@ -71 +71 @@
 protected:
   std::string        objectName;       //!< The name of this object
+  ClassID            leafClassID;      //!< classId of leaf class
 
 private:
@@ -107 +108 @@
 {
   this->_classes.push_front(ClassEntry(&objectList, objectList.registerObject(object)));
+  this->leafClassID = object->getClassID();
 }
 

branches/network/src/lib/network/handshake.h

@@ -113 +113 @@
     int                errorString_handler;                   //!< handshake error string handler
     int                candel_id;                             //!< handshake deletion handler
-    int                nodeType;                              //!, the type of the network node
+    int                nodeType;                              //!< the type of the network node
 
     int                redirectProxy;                         //!< true if the client should reconnect to a proxy server

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 );
+    }
+    
     assert( messageHandlerMap.find( (MessageType)messageType ) != messageHandlerMap.end());
 

branches/network/src/lib/network/peer_info.h

@@ -36 +36 @@
     int                 userId;                  //!< id of this network node
     int                 nodeType;                //!< type of this network node
-    IP                  ip;                      //!> the ip address of this network node
+    IP                  ip;                      //!< the ip address of this network node
 
     NetworkSocket *     socket;                  //!< socket connecting to this node

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

@@ -56 +56 @@
   /* make sure loadClassId is first synced var because this is read by networkStream */
   assert( syncVarList.size() == 0 );
-  mLeafClassId = this->registerVarId( new SynchronizeableInt( (int*)&this->getLeafClassID(), (int*)&this->getLeafClassID(), "leafClassId", PERMISSION_MASTER_SERVER) );
+  assert( this->getClassID() == this->objectList().id() );
+  mLeafClassId = this->registerVarId( new SynchronizeableInt( (int*)&leafClassID, (int*)&leafClassID, "leafClassId", PERMISSION_MASTER_SERVER) );
 
   this->registerVar( new SynchronizeableInt( &this->owner, &this->owner, "owner", PERMISSION_MASTER_SERVER ) );