Update of /cvsroot/wpdev/wolfpack/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26553/network
Modified Files:
encryption.cpp uosocket.cpp uosocket.h
Log Message:
QT_CLEAN_NAMESPACE
Index: encryption.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/encryption.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** encryption.cpp 19 Aug 2004 01:22:56 -0000 1.4
--- encryption.cpp 19 Aug 2004 01:55:56 -0000 1.5
***************
*** 109,113 ****
for ( Q_UINT32 i = 0; i < length; ++i )
{
! buffer[i] = buffer[i] ^ ( UINT8 ) ( table1 & 0xFF );
edx = table2;
esi = table1 << 31;
--- 109,113 ----
for ( Q_UINT32 i = 0; i < length; ++i )
{
! buffer[i] = buffer[i] ^ ( Q_UINT8 ) ( table1 & 0xFF );
edx = table2;
esi = table1 << 31;
***************
*** 179,183 ****
void cGameEncryption::serverEncrypt( char* buffer, unsigned int length )
{
! static const UINT8 xorData[0x10] =
{
// Seed: 7F000001
--- 179,183 ----
void cGameEncryption::serverEncrypt( char* buffer, unsigned int length )
{
! static const Q_UINT8 xorData[0x10] =
{
// Seed: 7F000001
Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.394
retrieving revision 1.395
diff -C2 -d -r1.394 -r1.395
*** uosocket.cpp 19 Aug 2004 01:22:56 -0000 1.394
--- uosocket.cpp 19 Aug 2004 01:55:56 -0000 1.395
***************
*** 1451,1455 ****
\sa cUObject, cUOTxUnicodeSpeech, cUOTxUnicodeSpeech::eSpeechType
*/
! void cUOSocket::showSpeech( const cUObject* object, const QString& message, Q_UINT16 color, Q_UINT16 font, UINT8 speechType ) const
{
cUOTxUnicodeSpeech speech;
--- 1451,1455 ----
\sa cUObject, cUOTxUnicodeSpeech, cUOTxUnicodeSpeech::eSpeechType
*/
! void cUOSocket::showSpeech( const cUObject* object, const QString& message, Q_UINT16 color, Q_UINT16 font, Q_UINT8 speechType ) const
{
cUOTxUnicodeSpeech speech;
***************
*** 2071,2075 ****
}
! void cUOSocket::attachTarget( cTargetRequest* request, std::vector<stTargetItem>& items, INT16 xOffset, INT16 yOffset, INT16 zOffset )
{
// Let the old one time out
--- 2071,2075 ----
}
! void cUOSocket::attachTarget( cTargetRequest* request, std::vector<stTargetItem>& items, Q_INT16 xOffset, Q_INT16 yOffset, Q_INT16 zOffset )
{
// Let the old one time out
***************
*** 2146,2150 ****
// Check if there really was a response or if it just was canceled
! if ( !packet->serial() && ( ( packet->x() == 0xFFFF ) || ( packet->y() == 0xFFFF ) || ( ( UINT8 ) packet->z() == 0xFF ) ) )
targetRequest->canceled( this );
else
--- 2146,2150 ----
// Check if there really was a response or if it just was canceled
! if ( !packet->serial() && ( ( packet->x() == 0xFFFF ) || ( packet->y() == 0xFFFF ) || ( ( Q_UINT8 ) packet->z() == 0xFF ) ) )
targetRequest->canceled( this );
else
***************
*** 2240,2244 ****
}
! void cUOSocket::bounceItem( P_ITEM pItem, UINT8 reason )
{
cUOTxBounceItem bounce;
--- 2240,2244 ----
}
! void cUOSocket::bounceItem( P_ITEM pItem, Q_UINT8 reason )
{
cUOTxBounceItem bounce;
***************
*** 2466,2470 ****
pUpdate.setRealValue( _player->skillValue( skill ) );
! UINT8 lock = _player->skillLock( skill );
if ( lock == 0 )
--- 2466,2470 ----
pUpdate.setRealValue( _player->skillValue( skill ) );
! Q_UINT8 lock = _player->skillLock( skill );
if ( lock == 0 )
***************
*** 2778,2782 ****
msg.setFont( font );
! UINT8 flags = 0;
if ( prepend )
flags |= cUOTxClilocMsgAffix::Prepend;
--- 2778,2782 ----
msg.setFont( font );
! Q_UINT8 flags = 0;
if ( prepend )
flags |= cUOTxClilocMsgAffix::Prepend;
Index: uosocket.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.h,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** uosocket.h 19 Aug 2004 01:46:13 -0000 1.124
--- uosocket.h 19 Aug 2004 01:55:56 -0000 1.125
***************
*** 82,86 ****
P_PLAYER _player;
eSocketState _state;
! UINT8 lastPacket, _viewRange, _walkSequence;
cTargetRequest* targetRequest;
QString _lang, _version;
--- 82,86 ----
P_PLAYER _player;
eSocketState _state;
! Q_UINT8 lastPacket, _viewRange, _walkSequence;
cTargetRequest* targetRequest;
QString _lang, _version;
***************
*** 248,252 ****
void updateChar( P_CHAR pChar );
void sendChar( P_CHAR pChar );
! void showSpeech( const cUObject* object, const QString& message, Q_UINT16 color = 0x3B2, Q_UINT16 font = 3, UINT8 speechType = 0x00 ) const;
void sysMessage( const QString& message, Q_UINT16 color = 0x3b2, Q_UINT16 font = 3 ) const;
void sendCharList();
--- 248,252 ----
void updateChar( P_CHAR pChar );
void sendChar( P_CHAR pChar );
! void showSpeech( const cUObject* object, const QString& message, Q_UINT16 color = 0x3B2, Q_UINT16 font = 3, Q_UINT8 speechType = 0x00 ) const;
void sysMessage( const QString& message, Q_UINT16 color = 0x3b2, Q_UINT16 font = 3 ) const;
void sendCharList();
***************
*** 261,265 ****
void playMusic( void );
void sendContainer( P_ITEM pCont );
! void bounceItem( P_ITEM pItem, UINT8 reason );
void updatePlayer();
void resendPlayer( bool quick = true );
--- 261,265 ----
void playMusic( void );
void sendContainer( P_ITEM pCont );
! void bounceItem( P_ITEM pItem, Q_UINT8 reason );
void updatePlayer();
void resendPlayer( bool quick = true );
|
