Changeset 9555 in orxonox.OLD

Timestamp:

Jul 28, 2006, 12:09:56 PM (18 years ago)

Author:

patrick

Message:

cleaned up a smaller memory leak

Location:

branches/proxy/src

Files:

• lib/network/message_manager.cc (modified) (2 diffs)
• lib/network/proxy/proxy_control.cc (modified) (2 diffs)
• world_entities/spawning_point.cc (modified) (1 diff)

branches/proxy/src/lib/network/message_manager.cc

@@ -253 +253 @@
       {
 
+        PRINTF(0)("<<< MessageManager: got msg with type: %i, from sender %i, to rec: %i\n", messageType, senderId, destinationId);
       // call the handler function and handle errors
         if ( !(*(messageHandlerMap[(MessageType)messageType].cb))( (MessageType)messageType, data + i, messageLength,
@@ -271 +272 @@
           incomingMessageQueue.push_back( msg );
         }
-        PRINTF(0)("<<< MessageManager: got msg with type: %i, from sender %i, to rec: %i\n", messageType, senderId, destinationId);
       }
       // or else forward the message to the other servers

branches/proxy/src/lib/network/proxy/proxy_control.cc

@@ -104 +104 @@
 bool ProxyControl::messageHandlerNewClient( MessageType messageType, byte * data, int dataLength, void * someData, int senderId, int destinationId  )
 {
-  int userId = 0;
   // body data length correct?
   if ( dataLength != INTSIZE )
@@ -112 +111 @@
   }
   // read the userId fromt he message body
-  assert( Converter::byteArrayToInt( data, &userId) == INTSIZE );
+  int newClientId = 0;
+  assert( Converter::byteArrayToInt( data, &newClientId) == INTSIZE );
 
-  PRINTF(0)("Got Signal: from %i new player arrived with userId: %i\n", senderId, userId);
+  PRINTF(0)("Got Signal: from %i new player arrived with userId: %i\n", senderId, newClientId);
   // part for the master server
   if( SharedNetworkData::getInstance()->isMasterServer())
   {
     // we now create the new player ship and stuff...
-    NetworkGameManager::getInstance()->signalNewPlayer(userId);
+    NetworkGameManager::getInstance()->signalNewPlayer(newClientId);
   }
   else if(SharedNetworkData::getInstance()->isProxyServerActive())

branches/proxy/src/world_entities/spawning_point.cc

@@ -207 +207 @@
 void SpawningPoint::sendRespawnMessage( int uniqueId )
 {
-  byte * buf = new byte[2*INTSIZE];
+  byte buf[2*INTSIZE];
 
   assert( Converter::intToByteArray( this->getUniqueID(), buf, INTSIZE ) == INTSIZE );