Changeset 9652 in orxonox.OLD

Timestamp:

Jul 31, 2006, 3:42:26 PM (18 years ago)

Author:

patrick

Message:

proxy server now temporarily does not open server ports (so i can test on one client). proxy server id bug fixed

Location:

branches/proxy/src

Files:

• lib/network/message_manager.cc (modified) (2 diffs)
• lib/network/network_manager.cc (modified) (1 diff)
• lib/network/network_stream.cc (modified) (1 diff)
• world_entities/space_ships/turbine_hover.cc (modified) (1 diff)

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

@@ -241 +241 @@
     assert( i + messageLength <= length );
     // make sure there is a message handler for this message type
-    assert( messageHandlerMap.find( (MessageType)messageType ) != messageHandlerMap.end() );
+    assert( messageHandlerMap.find( (MessageType)messageType ) == messageHandlerMap.end());
 
 
@@ -345 +345 @@
   if ( outgoingMessageQueue[userId].recievedMessages.size() > 1000 )
   {
-    for ( int j = 0; j < outgoingMessageQueue[userId].recievedMessages.size() - 1000; j++ )
+    for ( int j = 0; j < (int)outgoingMessageQueue[userId].recievedMessages.size() - 1000; j++ )
       outgoingMessageQueue[userId].recievedMessages.erase( outgoingMessageQueue[userId].recievedMessages.begin() );
   }

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

@@ -142 +142 @@
 
   // then start the server
-  this->networkStream->createServer( port, port + 1, port + 2);
+//   this->networkStream->createServer( port, port + 1, port + 2);
 
   // and to the other proxy servers also, this would be very nice if its works

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

@@ -487 +487 @@
           break;
         }
+        userId++;
 
 //         for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )

branches/proxy/src/world_entities/space_ships/turbine_hover.cc

@@ -286 +286 @@
 
   ///HACK this is very much hard coded.set the owner of the weapons
-  this->getWeaponManager().getWeapon(0)->setOwner(/*SharedNetworkData::getInstance()->getHostID()*/ this->getOwner());
-  this->getWeaponManager().getWeapon(1)->setOwner(/*SharedNetworkData::getInstance()->getHostID()*/this->getOwner());
+  this->getWeaponManager().getWeapon(0)->setOwner(this->getOwner());
+  this->getWeaponManager().getWeapon(1)->setOwner(this->getOwner());
 
   //choose collision list