Update of /cvsroot/wpdev/wolfpack/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25747/network
Modified Files:
uosocket.h
Log Message:
QT_CLEAN_NAMESPACE
Index: uosocket.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.h,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** uosocket.h 19 Aug 2004 01:22:56 -0000 1.123
--- uosocket.h 19 Aug 2004 01:46:13 -0000 1.124
***************
*** 57,63 ****
{
Q_UINT16 id;
! INT16 xOffset;
! INT16 yOffset;
! INT16 zOffset;
Q_UINT16 hue;
};
--- 57,63 ----
{
Q_UINT16 id;
! Q_INT16 xOffset;
! Q_INT16 yOffset;
! Q_INT16 zOffset;
Q_UINT16 hue;
};
***************
*** 268,272 ****
void attachTarget( cTargetRequest* request );
void attachTarget( cTargetRequest* request, Q_UINT16 multiid );
! void attachTarget( cTargetRequest* request, std::vector<stTargetItem>& items, INT16 xOffset = 0, INT16 yOffset = 0, INT16 zOffset = 0 );
void cancelTarget();
void resendWorld( bool clean = true );
--- 268,272 ----
void attachTarget( cTargetRequest* request );
void attachTarget( cTargetRequest* request, Q_UINT16 multiid );
! void attachTarget( cTargetRequest* request, std::vector<stTargetItem>& items, Q_INT16 xOffset = 0, Q_INT16 yOffset = 0, Q_INT16 zOffset = 0 );
void cancelTarget();
void resendWorld( bool clean = true );
|
