Changeset 8648 for code/branches/presentation/src/libraries/network

Timestamp:

May 28, 2011, 8:53:14 PM (14 years ago)

Author:

scheusso

Message:

some network related fixes

Location:

code/branches/presentation/src/libraries/network

Files:

• Server.cc (modified) (1 diff)
• packet/Welcome.cc (modified) (1 diff)
• packet/Welcome.h (modified) (1 diff)

code/branches/presentation/src/libraries/network/Server.cc

@@ -413 +413 @@
     
     COUT(4) << "sending welcome" << std::endl;
-    packet::Welcome *w = new packet::Welcome(clientID, OBJECTID_UNKNOWN);
+    packet::Welcome *w = new packet::Welcome(clientID);
     w->setPeerID(clientID);
     b = w->send( static_cast<Host*>(this) );

code/branches/presentation/src/libraries/network/packet/Welcome.cc

@@ -44 +44 @@
 #define _ENDIANTEST           _CLIENTID + sizeof(uint32_t)
 
-  Welcome::Welcome( uint32_t clientID, uint32_t shipID )
+  Welcome::Welcome( uint32_t clientID )
  : Packet()
 {

code/branches/presentation/src/libraries/network/packet/Welcome.h

@@ -41 +41 @@
 {
 public:
-  Welcome( uint32_t clientID, uint32_t shipID );
+  Welcome( uint32_t clientID );
   Welcome( uint8_t* data, uint32_t clientID );
   virtual ~Welcome();