Changeset 2483 for code/branches/presentation/src

Timestamp:

Dec 16, 2008, 3:31:22 PM (16 years ago)

Author:

scheusso

Message:

removed shipdid from welcome because it's not needed anymore

File:

• code/branches/presentation/src/network/packet/Welcome.cc (modified) (3 diffs)

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

@@ -42 +42 @@
 #define _PACKETID             0
 #define _CLIENTID             _PACKETID + sizeof(ENUM::Type)
-#define _SHIPID               _CLIENTID + sizeof(uint32_t)
-#define _ENDIANTEST           _SHIPID + sizeof(uint32_t)
+#define _ENDIANTEST           _CLIENTID + sizeof(uint32_t)
   
-  Welcome::Welcome( unsigned int clientID, unsigned int shipID )
+  Welcome::Welcome( uint32_t clientID, uint32_t shipID )
  : Packet()
 {
@@ -53 +52 @@
   assert(data_);
   *(packet::ENUM::Type *)(data_ + _PACKETID ) = packet::ENUM::Welcome;
-  *(uint32_t *)(data_ + _CLIENTID ) = clientID;
-  *(uint32_t *)(data_ + _SHIPID ) = shipID;
+  *(uint32_t *)(data_ + _CLIENTID ) = static_cast<uint32_t>(clientID);
   *(uint32_t *)(data_ + _ENDIANTEST ) = 0xFEDC4321;
 }
 
-Welcome::Welcome( uint8_t* data, unsigned int clientID )
+Welcome::Welcome( uint8_t* data, uint32_t clientID )
   : Packet(data, clientID)
 {
@@ -72 +70 @@
 
 unsigned int Welcome::getSize() const{
-  return sizeof(packet::ENUM::Type) + 3*sizeof(uint32_t);
+  return sizeof(packet::ENUM::Type) + 2*sizeof(uint32_t);
 }
 
 bool Welcome::process(){
-  unsigned int shipID, clientID;
-  clientID = *(uint32_t *)&data_[ _CLIENTID ];
-  shipID = *(uint32_t *)&data_[ _SHIPID ];
+  uint32_t shipID, clientID;
+  clientID = *(uint32_t *)(data_ + _CLIENTID );
   assert(*(uint32_t *)(data_ + _ENDIANTEST ) == 0xFEDC4321);
   Host::setClientID(clientID);
-  Host::setShipID(shipID);
-  COUT(3) << "Welcome set clientId: " << clientID << " shipID: " << shipID << std::endl;
+  COUT(3) << "Welcome set clientId: " << clientID << endl;
   Synchronisable::setClient(true);
   delete this;