From: Arianna B. <ar...@us...> - 2006-01-31 20:06:04
|
Update of /cvsroot/planeshift/planeshift/src/common/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23422 Modified Files: message.h netpacket.h Log Message: Fix compiling errors Index: message.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/net/message.h,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** message.h 31 Jan 2006 08:08:44 -0000 1.53 --- message.h 31 Jan 2006 20:05:53 -0000 1.54 *************** *** 705,709 **** uint32_t *p = (uint32_t *)(bytes->payload+current); current += sizeof(uint32_t); ! return csLittleEndian::Convert(*p); } --- 705,709 ---- uint32_t *p = (uint32_t *)(bytes->payload+current); current += sizeof(uint32_t); ! return csLittleEndian::UInt32(*p); } Index: netpacket.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/net/netpacket.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** netpacket.h 31 Jan 2006 06:45:03 -0000 1.38 --- netpacket.h 31 Jan 2006 20:05:53 -0000 1.39 *************** *** 94,101 **** void UnmarshallEndian() { // Unpack from transmission. This deendian-izes the packet. ! pktid = csLittleEndian::Convert(pktid); ! offset = csLittleEndian::Convert(offset); ! msgsize = csLittleEndian::Convert(msgsize); ! pktsize = csLittleEndian::Convert(pktsize); } --- 94,101 ---- void UnmarshallEndian() { // Unpack from transmission. This deendian-izes the packet. ! pktid = csLittleEndian::UInt32(pktid); ! offset = csLittleEndian::UInt32(offset); ! msgsize = csLittleEndian::UInt32(msgsize); ! pktsize = csLittleEndian::UInt16(pktsize); } |