Changeset 2531 for code/branches/bugger/src/network/packet/Welcome.cc
- Timestamp:
- Dec 23, 2008, 11:09:55 PM (15 years ago)
- Location:
- code/branches/bugger
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/bugger
- Property svn:mergeinfo changed
/code/branches/network (added) merged: 2356 /code/branches/network64 (added) merged: 2210-2211,2245-2247,2255,2307,2309-2312,2316,2355
- Property svn:mergeinfo changed
-
code/branches/bugger/src/network/packet/Welcome.cc
r2171 r2531 32 32 #include "Welcome.h" 33 33 #include "network/Host.h" 34 #include "network/ Synchronisable.h"34 #include "network/synchronisable/Synchronisable.h" 35 35 #include "core/CoreIncludes.h" 36 36 #include <assert.h> … … 43 43 #define _CLIENTID _PACKETID + sizeof(ENUM::Type) 44 44 #define _SHIPID _CLIENTID + sizeof(uint32_t) 45 #define _ENDIANTEST _SHIPID + sizeof(uint32_t) 45 46 46 47 Welcome::Welcome( unsigned int clientID, unsigned int shipID ) … … 52 53 assert(data_); 53 54 *(packet::ENUM::Type *)(data_ + _PACKETID ) = packet::ENUM::Welcome; 54 *(uint32_t *)&data_[ _CLIENTID ] = clientID; 55 *(uint32_t *)&data_[ _SHIPID ] = shipID; 55 *(uint32_t *)(data_ + _CLIENTID ) = clientID; 56 *(uint32_t *)(data_ + _SHIPID ) = shipID; 57 *(uint32_t *)(data_ + _ENDIANTEST ) = 0xFEDC4321; 56 58 } 57 59 … … 70 72 71 73 unsigned int Welcome::getSize() const{ 72 return sizeof(packet::ENUM::Type) + 2*sizeof(uint32_t);74 return sizeof(packet::ENUM::Type) + 3*sizeof(uint32_t); 73 75 } 74 76 … … 77 79 clientID = *(uint32_t *)&data_[ _CLIENTID ]; 78 80 shipID = *(uint32_t *)&data_[ _SHIPID ]; 81 assert(*(uint32_t *)(data_ + _ENDIANTEST ) == 0xFEDC4321); 79 82 Host::setClientID(clientID); 80 83 Host::setShipID(shipID);
Note: See TracChangeset
for help on using the changeset viewer.