Changeset 8708 in orxonox.OLD for trunk/src/lib/network/message_manager.cc

Timestamp:

Jun 22, 2006, 12:48:01 PM (18 years ago)

Author:

bensch

Message:

merged network back
merged with command:
svn merge -r8625:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
no conflicts

File:

• trunk/src/lib/network/message_manager.cc (modified) (6 diffs)

trunk/src/lib/network/message_manager.cc

@@ -19 +19 @@
 
 #include "network_stream.h"
+#include "shared_network_data.h"
 
 using namespace std;
@@ -196 +197 @@
         msg.number = userId;
         
-        incomingMessabeBuffer.push_back( msg );
+        incomingMessageBuffer.push_back( msg );
       }
       messageQueue[userId].recievedMessages.push_back( number );
@@ -204 +205 @@
   
   
-  for ( std::list<NetworkMessage>::iterator it = incomingMessabeBuffer.begin(); it != incomingMessabeBuffer.end();  )
+  //TODO maybe handle incomingMessage in tick function. else local messages will not be handled if no clients are connected
+  for ( std::list<NetworkMessage>::iterator it = incomingMessageBuffer.begin(); it != incomingMessageBuffer.end();  )
   {
     if ( (*(messageHandlerMap[it->messageId].cb))( it->messageId, it->data, it->length, messageHandlerMap[it->messageId].someData, it->number ) )
@@ -212 +214 @@
         delete it->data;
       it++;
-      incomingMessabeBuffer.erase( delIt );
+      incomingMessageBuffer.erase( delIt );
       continue;
     }
@@ -328 +330 @@
 
       it->second.messages.push_back( msg );
-      
-     
     }
   }
@@ -341 +341 @@
     msg.length = dataLength;
     msg.messageId = messageId;
-    msg.number = newNumber++;
+    msg.number = SharedNetworkData::getInstance()->getHostID();
     msg.priority = messagePriority;
 
-    incomingMessabeBuffer.push_back( msg );
-  }
-}
-
-
+    incomingMessageBuffer.push_back( msg );
+  }
+}
+
+