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

Timestamp:

Jun 20, 2006, 1:39:01 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back here
merged with command:
svn merge -r8230:HEAD ​https://svn.orxonox.net/orxonox/branches/network .
conflicts resolved in favour of the network branche (conflicts were in network)

File:

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

trunk/src/lib/network/message_manager.cc

@@ -47 +47 @@
       if ( it2->data )
       {
-        delete it2->data;
+        delete [] it2->data;
         it2->data = NULL;
       }
@@ -319 +319 @@
     {
       NetworkMessage msg;
-      
+
       msg.data = new byte[dataLength];
       memcpy( msg.data, data, dataLength );
@@ -326 +326 @@
       msg.number = newNumber++;
       msg.priority = messagePriority;
-      
+
       it->second.messages.push_back( msg );
       
-      if ( recieverType == RT_ALL_ME )
-        incomingMessabeBuffer.push_back( msg );
-    }
-  }
-}
-
-
+     
+    }
+  }
+  
+  if ( recieverType == RT_ALL_ME )
+  {
+    NetworkMessage msg;
+
+    msg.data = new byte[dataLength];
+    memcpy( msg.data, data, dataLength );
+    msg.length = dataLength;
+    msg.messageId = messageId;
+    msg.number = newNumber++;
+    msg.priority = messagePriority;
+
+    incomingMessabeBuffer.push_back( msg );
+  }
+}
+
+