|
From: Correa <thi...@us...> - 2004-08-10 03:24:39
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19142 Modified Files: asyncnetio.cpp asyncnetio.h encryption.cpp encryption.h uopacket.cpp uorxpackets.h uosocket.cpp uosocket.h uotxpackets.cpp uotxpackets.h Log Message: applied coding standard rules. Index: encryption.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/encryption.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** encryption.h 19 Jun 2004 02:06:51 -0000 1.3 --- encryption.h 10 Aug 2004 03:24:29 -0000 1.4 *************** *** 71,75 **** { public: ! virtual ~cClientEncryption() {} virtual void serverEncrypt( char* buffer, unsigned int length ) = 0; virtual void clientDecrypt( char* buffer, unsigned int length ) = 0; --- 71,77 ---- { public: ! virtual ~cClientEncryption() ! { ! } virtual void serverEncrypt( char* buffer, unsigned int length ) = 0; virtual void clientDecrypt( char* buffer, unsigned int length ) = 0; Index: uorxpackets.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uorxpackets.h,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** uorxpackets.h 2 Jul 2004 06:01:21 -0000 1.64 --- uorxpackets.h 10 Aug 2004 03:24:29 -0000 1.65 *************** *** 1229,1247 **** // 0x98 AllNames ! class cUORxAllNames : public cUOPacket { public: ! cUORxAllNames(const QByteArray &data) : cUOPacket( data ) { } ! unsigned int serial() { ! return getInt(3); } ! const QString name() { ! return getAsciiString(7); } }; --- 1229,1247 ---- // 0x98 AllNames ! class cUORxAllNames : public cUOPacket { public: ! cUORxAllNames( const QByteArray& data ) : cUOPacket( data ) { } ! unsigned int serial() { ! return getInt( 3 ); } ! const QString name() { ! return getAsciiString( 7 ); } }; Index: uotxpackets.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.h,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** uotxpackets.h 27 Jul 2004 06:35:23 -0000 1.111 --- uotxpackets.h 10 Aug 2004 03:24:29 -0000 1.112 *************** *** 2365,2369 **** setShort( 10, 0 ); setInt( 12, 0xFF ); ! ( *this )[16] = static_cast<uchar>(0xFF); } void setSerial( unsigned int data ) --- 2365,2369 ---- setShort( 10, 0 ); setInt( 12, 0xFF ); ! ( *this )[16] = static_cast<uchar>( 0xFF ); } void setSerial( unsigned int data ) *************** *** 2466,2481 **** // 0x98 AllNames ! class cUOTxAllNames : public cUOPacket { public: ! cUOTxAllNames() : cUOPacket(0x98, 37) { ! setShort(1, 37); } ! void setSerial(unsigned int data) { ! setInt(3, data); } ! void setName(const QString &name) { ! setAsciiString(7, name.latin1(), 29); } }; --- 2466,2485 ---- // 0x98 AllNames ! class cUOTxAllNames : public cUOPacket ! { public: ! cUOTxAllNames() : cUOPacket( 0x98, 37 ) ! { ! setShort( 1, 37 ); } ! void setSerial( unsigned int data ) ! { ! setInt( 3, data ); } ! void setName( const QString& name ) ! { ! setAsciiString( 7, name.latin1(), 29 ); } }; Index: uopacket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uopacket.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** uopacket.cpp 27 Jul 2004 06:35:22 -0000 1.44 --- uopacket.cpp 10 Aug 2004 03:24:29 -0000 1.45 *************** *** 180,184 **** static bitTable[257] = { ! {0x02, 0x00}, {0x05, 0x1F}, {0x06, 0x22}, {0x07, 0x34}, {0x07, 0x75}, {0x06, 0x28}, {0x06, 0x3B}, {0x07, 0x32}, {0x08, 0xE0}, {0x08, 0x62}, {0x07, 0x56}, {0x08, 0x79}, {0x09, 0x19D}, {0x08, 0x97}, {0x06, 0x2A}, {0x07, 0x57}, {0x08, 0x71}, {0x08, 0x5B}, {0x09, 0x1CC}, {0x08, 0xA7}, {0x07, 0x25}, {0x07, 0x4F}, {0x08, 0x66}, {0x08, 0x7D}, {0x09, 0x191}, {0x09, 0x1CE}, {0x07, 0x3F}, {0x09, 0x90}, {0x08, 0x59}, {0x08, 0x7B}, {0x08, 0x91}, {0x08, 0xC6}, {0x06, 0x2D}, {0x09, 0x186}, {0x08, 0x6F}, {0x09, 0x93}, {0x0A, 0x1CC}, {0x08, 0x5A}, {0x0A, 0x1AE}, {0x0A, 0x1C0}, {0x09, 0x148}, {0x09, 0x14A}, {0x09, 0x82}, {0x0A, 0x19F}, {0x09, 0x171}, {0x09, 0x120}, {0x09, 0xE7}, {0x0A, 0x1F3}, {0x09, 0x14B}, {0x09, 0x100}, {0x09, 0x190}, {0x06, 0x13}, {0x09, 0x161}, {0x09, 0x125}, {0x09, 0x133}, {0x09, 0x195}, {0x09, 0x173}, {0x09, 0x1CA}, {0x09, 0x86}, {0x09, 0x1E9}, {0x09, 0xDB}, {0x09, 0x1EC}, {0x09, 0x8B}, {0x09, 0x85}, {0x05, 0x0A}, {0x08, 0x96}, {0x08, 0x9C}, {0x09, 0x1C3}, {0x09, 0x19C}, {0x09, 0x8F}, {0x09, 0x18F}, {0x09, 0x91}, {0x09, 0x87}, {0x09, 0xC6}, {0x09, 0x177}, {0x09, 0x89}, {0x09, 0xD6}, {0x09, 0x8C}, {0x09, 0x1EE}, {0x09, 0x1EB}, {0x09, 0x84}, {0x09, 0x164}, {0x09, 0x175}, {0x09, 0x1CD}, {0x08, 0x5E}, {0x09, 0x88}, {0x09, 0x12B}, {0x09, 0x172}, {0x09, 0x10A}, {0x09, 0x8D}, {0x09, 0x13A}, {0x09, 0x11C}, {0x0A, 0x1E1}, {0x0A, 0x1E0}, {0x09, 0x187}, {0x0A, 0x1DC}, {0x0A, 0x1DF}, {0x07, 0x74}, {0x09, 0x19F}, {0x08, 0x8D}, {0x08, 0xE4}, {0x07, 0x79}, {0x09, 0xEA}, {0x09, 0xE1}, {0x08, 0x40}, {0x07, 0x41}, {0x09, 0x10B}, {0x09, 0xB0}, {0x08, 0x6A}, {0x08, 0xC1}, {0x07, 0x71}, {0x07, 0x78}, {0x08, 0xB1}, {0x09, 0x14C}, {0x07, 0x43}, {0x08, 0x76}, {0x07, 0x66}, {0x07, 0x4D}, {0x09, 0x8A}, {0x06, 0x2F}, {0x08, 0xC9}, {0x09, 0xCE}, {0x09, 0x149}, {0x09, 0x160}, {0x0A, 0x1BA}, {0x0A, 0x19E}, {0x0A, 0x39F}, {0x09, 0xE5}, {0x09, 0x194}, {0x09, 0x184}, {0x09, 0x126}, {0x07, 0x30}, {0x08, 0x6C}, {0x09, 0x121}, {0x09, 0x1E8}, {0x0A, 0x1C1}, {0x0A, 0x11D}, {0x0A, 0x163}, {0x0A, 0x385}, {0x0A, 0x3DB}, {0x0A, 0x17D}, {0x0A, 0x106}, {0x0A, 0x397}, {0x0A, 0x24E}, {0x07, 0x2E}, {0x08, 0x98}, {0x0A, 0x33C}, {0x0A, 0x32E}, {0x0A, 0x1E9}, {0x09, 0xBF}, {0x0A, 0x3DF}, {0x0A, 0x1DD}, {0x0A, 0x32D}, {0x0A, 0x2ED}, {0x0A, 0x30B}, {0x0A, 0x107}, {0x0A, 0x2E8}, {0x0A, 0x3DE}, {0x0A, 0x125}, {0x0A, 0x1E8}, {0x09, 0xE9}, {0x0A, 0x1CD}, {0x0A, 0x1B5}, {0x09, 0x165}, {0x0A, 0x232}, {0x0A, 0x2E1}, {0x0B, 0x3AE}, {0x0B, 0x3C6}, {0x0B, 0x3E2}, {0x0A, 0x205}, {0x0A, 0x29A}, {0x0A, 0x248}, {0x0A, 0x2CD}, {0x0A, 0x23B}, {0x0B, 0x3C5}, {0x0A, 0x251}, {0x0A, 0x2E9}, {0x0A, 0x252}, {0x09, 0x1EA}, {0x0B, 0x3A0}, {0x0B, 0x391}, {0x0A, 0x23C}, {0x0B, 0x392}, {0x0B, 0x3D5}, {0x0A, 0x233}, {0x0A, 0x2CC}, {0x0B, 0x390}, {0x0A, 0x1BB}, {0x0B, 0x3A1}, {0x0B, 0x3C4}, {0x0A, 0x211}, {0x0A, 0x203}, {0x09, 0x12A}, {0x0A, 0x231}, {0x0B, 0x3E0}, {0x0A, 0x29B}, {0x0B, 0x3D7}, {0x0A, 0x202}, {0x0B, 0x3AD}, {0x0A, 0x213}, {0x0A, 0x253}, {0x0A, 0x32C}, {0x0A, 0x23D}, {0x0A, 0x23F}, {0x0A, 0x32F}, {0x0A, 0x11C}, {0x0A, 0x384}, {0x0A, 0x31C}, {0x0A, 0x17C}, {0x0A, 0x30A}, {0x0A, 0x2E0}, {0x0A, 0x276}, {0x0A, 0x250}, {0x0B, 0x3E3}, {0x0A, 0x396}, {0x0A, 0x18F}, {0x0A, 0x204}, {0x0A, 0x206}, {0x0A, 0x230}, {0x0A, 0x265}, {0x0A, 0x212}, {0x0A, 0x23E}, {0x0B, 0x3AC}, {0x0B, 0x393}, {0x0B, 0x3E1}, {0x0A, 0x1DE}, {0x0B, 0x3D6}, {0x0A, 0x31D}, {0x0B, 0x3E5}, {0x0B, 0x3E4}, {0x0A, 0x207}, {0x0B, 0x3C7}, {0x0A, 0x277}, {0x0B, 0x3D4}, {0x08, 0xC0}, {0x0A, 0x162}, {0x0A, 0x3DA}, {0x0A, 0x124}, {0x0A, 0x1B4}, {0x0A, 0x264}, {0x0A, 0x33D}, {0x0A, 0x1D1}, {0x0A, 0x1AF}, {0x0A, 0x39E}, {0x0A, 0x24F}, {0x0B, 0x373}, {0x0A, 0x249}, {0x0B, 0x372}, {0x09, 0x167}, {0x0A, 0x210}, {0x0A, 0x23A}, {0x0A, 0x1B8}, {0x0B, 0x3AF}, {0x0A, 0x18E}, {0x0A, 0x2EC}, {0x07, 0x62}, {0x04, 0x0D} }; --- 180,184 ---- static bitTable[257] = { ! {0x02, 0x00}, {0x05, 0x1F}, {0x06, 0x22}, {0x07, 0x34}, {0x07, 0x75}, {0x06, 0x28}, {0x06, 0x3B}, {0x07, 0x32}, {0x08, 0xE0}, {0x08, 0x62}, {0x07, 0x56}, {0x08, 0x79}, {0x09, 0x19D}, {0x08, 0x97}, {0x06, 0x2A}, {0x07, 0x57}, {0x08, 0x71}, {0x08, 0x5B}, {0x09, 0x1CC}, {0x08, 0xA7}, {0x07, 0x25}, {0x07, 0x4F}, {0x08, 0x66}, {0x08, 0x7D}, {0x09, 0x191}, {0x09, 0x1CE}, {0x07, 0x3F}, {0x09, 0x90}, {0x08, 0x59}, {0x08, 0x7B}, {0x08, 0x91}, {0x08, 0xC6}, {0x06, 0x2D}, {0x09, 0x186}, {0x08, 0x6F}, {0x09, 0x93}, {0x0A, 0x1CC}, {0x08, 0x5A}, {0x0A, 0x1AE}, {0x0A, 0x1C0}, {0x09, 0x148}, {0x09, 0x14A}, {0x09, 0x82}, {0x0A, 0x19F}, {0x09, 0x171}, {0x09, 0x120}, {0x09, 0xE7}, {0x0A, 0x1F3}, {0x09, 0x14B}, {0x09, 0x100}, {0x09, 0x190}, {0x06, 0x13}, {0x09, 0x161}, {0x09, 0x125}, {0x09, 0x133}, {0x09, 0x195}, {0x09, 0x173}, {0x09, 0x1CA}, {0x09, 0x86}, {0x09, 0x1E9}, {0x09, 0xDB}, {0x09, 0x1EC}, {0x09, 0x8B}, {0x09, 0x85}, {0x05, 0x0A}, {0x08, 0x96}, {0x08, 0x9C}, {0x09, 0x1C3}, {0x09, 0x19C}, {0x09, 0x8F}, {0x09, 0x18F}, {0x09, 0x91}, {0x09, 0x87}, {0x09, 0xC6}, {0x09, 0x177}, {0x09, 0x89}, {0x09, 0xD6}, {0x09, 0x8C}, {0x09, 0x1EE}, {0x09, 0x1EB}, {0x09, 0x84}, {0x09, 0x164}, {0x09, 0x175}, {0x09, 0x1CD}, {0x08, 0x5E}, {0x09, 0x88}, {0x09, 0x12B}, {0x09, 0x172}, {0x09, 0x10A}, {0x09, 0x8D}, {0x09, 0x13A}, {0x09, 0x11C}, {0x0A, 0x1E1}, {0x0A, 0x1E0}, {0x09, 0x187}, {0x0A, 0x1DC}, {0x0A, 0x1DF}, {0x07, 0x74}, {0x09, 0x19F}, {0x08, 0x8D}, {0x08, 0xE4}, {0x07, 0x79}, {0x09, 0xEA}, {0x09, 0xE1}, {0x08, 0x40}, {0x07, 0x41}, {0x09, 0x10B}, {0x09, 0xB0}, {0x08, 0x6A}, {0x08, 0xC1}, {0x07, 0x71}, {0x07, 0x78}, {0x08, 0xB1}, {0x09, 0x14C}, {0x07, 0x43}, {0x08, 0x76}, {0x07, 0x66}, {0x07, 0x4D}, {0x09, 0x8A}, {0x06, 0x2F}, {0x08, 0xC9}, {0x09, 0xCE}, {0x09, 0x149}, {0x09, 0x160}, {0x0A, 0x1BA}, {0x0A, 0x19E}, {0x0A, 0x39F}, {0x09, 0xE5}, {0x09, 0x194}, {0x09, 0x184}, {0x09, 0x126}, {0x07, 0x30}, {0x08, 0x6C}, {0x09, 0x121}, {0x09, 0x1E8}, {0x0A, 0x1C1}, {0x0A, 0x11D}, {0x0A, 0x163}, {0x0A, 0x385}, {0x0A, 0x3DB}, {0x0A, 0x17D}, {0x0A, 0x106}, {0x0A, 0x397}, {0x0A, 0x24E}, {0x07, 0x2E}, {0x08, 0x98}, {0x0A, 0x33C}, {0x0A, 0x32E}, {0x0A, 0x1E9}, {0x09, 0xBF}, {0x0A, 0x3DF}, {0x0A, 0x1DD}, {0x0A, 0x32D}, {0x0A, 0x2ED}, {0x0A, 0x30B}, {0x0A, 0x107}, {0x0A, 0x2E8}, {0x0A, 0x3DE}, {0x0A, 0x125}, {0x0A, 0x1E8}, {0x09, 0xE9}, {0x0A, 0x1CD}, {0x0A, 0x1B5}, {0x09, 0x165}, {0x0A, 0x232}, {0x0A, 0x2E1}, {0x0B, 0x3AE}, {0x0B, 0x3C6}, {0x0B, 0x3E2}, {0x0A, 0x205}, {0x0A, 0x29A}, {0x0A, 0x248}, {0x0A, 0x2CD}, {0x0A, 0x23B}, {0x0B, 0x3C5}, {0x0A, 0x251}, {0x0A, 0x2E9}, {0x0A, 0x252}, {0x09, 0x1EA}, {0x0B, 0x3A0}, {0x0B, 0x391}, {0x0A, 0x23C}, {0x0B, 0x392}, {0x0B, 0x3D5}, {0x0A, 0x233}, {0x0A, 0x2CC}, {0x0B, 0x390}, {0x0A, 0x1BB}, {0x0B, 0x3A1}, {0x0B, 0x3C4}, {0x0A, 0x211}, {0x0A, 0x203}, {0x09, 0x12A}, {0x0A, 0x231}, {0x0B, 0x3E0}, {0x0A, 0x29B}, {0x0B, 0x3D7}, {0x0A, 0x202}, {0x0B, 0x3AD}, {0x0A, 0x213}, {0x0A, 0x253}, {0x0A, 0x32C}, {0x0A, 0x23D}, {0x0A, 0x23F}, {0x0A, 0x32F}, {0x0A, 0x11C}, {0x0A, 0x384}, {0x0A, 0x31C}, {0x0A, 0x17C}, {0x0A, 0x30A}, {0x0A, 0x2E0}, {0x0A, 0x276}, {0x0A, 0x250}, {0x0B, 0x3E3}, {0x0A, 0x396}, {0x0A, 0x18F}, {0x0A, 0x204}, {0x0A, 0x206}, {0x0A, 0x230}, {0x0A, 0x265}, {0x0A, 0x212}, {0x0A, 0x23E}, {0x0B, 0x3AC}, {0x0B, 0x393}, {0x0B, 0x3E1}, {0x0A, 0x1DE}, {0x0B, 0x3D6}, {0x0A, 0x31D}, {0x0B, 0x3E5}, {0x0B, 0x3E4}, {0x0A, 0x207}, {0x0B, 0x3C7}, {0x0A, 0x277}, {0x0B, 0x3D4}, {0x08, 0xC0}, {0x0A, 0x162}, {0x0A, 0x3DA}, {0x0A, 0x124}, {0x0A, 0x1B4}, {0x0A, 0x264}, {0x0A, 0x33D}, {0x0A, 0x1D1}, {0x0A, 0x1AF}, {0x0A, 0x39E}, {0x0A, 0x24F}, {0x0B, 0x373}, {0x0A, 0x249}, {0x0B, 0x372}, {0x09, 0x167}, {0x0A, 0x210}, {0x0A, 0x23A}, {0x0A, 0x1B8}, {0x0B, 0x3AF}, {0x0A, 0x18E}, {0x0A, 0x2EC}, {0x07, 0x62}, {0x04, 0x0D} }; Index: asyncnetio.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/asyncnetio.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** asyncnetio.cpp 4 Aug 2004 23:17:38 -0000 1.48 --- asyncnetio.cpp 10 Aug 2004 03:24:29 -0000 1.49 *************** *** 55,90 **** const Q_UINT16 packetLengths[256] = { ! 0x0068, 0x0005, 0x0007, 0x0000, 0x0002, 0x0005, 0x0005, 0x0007, // 0x00 ! 0x000e, 0x0005, 0x000b, 0x010a, 0x0000, 0x0003, 0x0000, 0x003d, // 0x08 ! 0x00d7, 0x0000, 0x0000, 0x000a, 0x0006, 0x0009, 0x0001, 0x0000, // 0x10 ! 0x0000, 0x0000, 0x0000, 0x0025, 0x0000, 0x0005, 0x0004, 0x0008, // 0x18 ! 0x0013, 0x0008, 0x0003, 0x001a, 0x0007, 0x0014, 0x0005, 0x0002, // 0x20 ! 0x0005, 0x0001, 0x0005, 0x0002, 0x0002, 0x0011, 0x000f, 0x000a, // 0x28 ! 0x0005, 0x0001, 0x0002, 0x0002, 0x000a, 0x028d, 0x0000, 0x0008, // 0x30 ! 0x0007, 0x0009, 0x0000, 0x0000, 0x0000, 0x0002, 0x0025, 0x0000, // 0x38 ! 0x00c9, 0x0000, 0x0000, 0x0229, 0x02c9, 0x0005, 0x0000, 0x000b, // 0x40 ! 0x0049, 0x005d, 0x0005, 0x0009, 0x0000, 0x0000, 0x0006, 0x0002, // 0x48 ! 0x0000, 0x0000, 0x0000, 0x0002, 0x000c, 0x0001, 0x000b, 0x006e, // 0x50 ! 0x006a, 0x0000, 0x0000, 0x0004, 0x0002, 0x0049, 0x0000, 0x0031, // 0x58 ! 0x0005, 0x0009, 0x000f, 0x000d, 0x0001, 0x0004, 0x0000, 0x0015, // 0x60 ! 0x0000, 0x0000, 0x0003, 0x0009, 0x0013, 0x0003, 0x000e, 0x0000, // 0x68 ! 0x001c, 0x0000, 0x0005, 0x0002, 0x0000, 0x0023, 0x0010, 0x0011, // 0x70 ! 0x0000, 0x0009, 0x0000, 0x0002, 0x0000, 0x000d, 0x0002, 0x0000, // 0x78 ! 0x003e, 0x0000, 0x0002, 0x0027, 0x0045, 0x0002, 0x0000, 0x0000, // 0x80 ! 0x0042, 0x0000, 0x0000, 0x0000, 0x000b, 0x0000, 0x0000, 0x0000, // 0x88 ! 0x0013, 0x0041, 0x0000, 0x0063, 0x0000, 0x0009, 0x0000, 0x0002, // 0x90 ! 0x0000, 0x001a, 0x0000, 0x0102, 0x0135, 0x0033, 0x0000, 0x0000, // 0x98 ! 0x0003, 0x0009, 0x0009, 0x0009, 0x0095, 0x0000, 0x0000, 0x0004, // 0xA0 ! 0x0000, 0x0000, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x000d, // 0xA8 ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0040, 0x0009, 0x0000, // 0xB0 ! 0x0000, 0x0003, 0x0006, 0x0009, 0x0003, 0x0000, 0x0000, 0x0000, // 0xB8 ! 0x0024, 0x0000, 0x0000, 0x0000, 0x0006, 0x00cb, 0x0001, 0x0031, // 0xC0 ! 0x0002, 0x0006, 0x0006, 0x0007, 0x0000, 0x0001, 0x0000, 0x004e, // 0xC8 ! 0x0000, 0x0002, 0x0019, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0xD0 ! 0x0000, 0x010C, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0xD8 ! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0xE0 ! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0xE8 ! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0xF0 ! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0xF8 }; --- 55,90 ---- const Q_UINT16 packetLengths[256] = { ! 0x0068, 0x0005, 0x0007, 0x0000, 0x0002, 0x0005, 0x0005, 0x0007, // 0x00 ! 0x000e, 0x0005, 0x000b, 0x010a, 0x0000, 0x0003, 0x0000, 0x003d, // 0x08 ! 0x00d7, 0x0000, 0x0000, 0x000a, 0x0006, 0x0009, 0x0001, 0x0000, // 0x10 ! 0x0000, 0x0000, 0x0000, 0x0025, 0x0000, 0x0005, 0x0004, 0x0008, // 0x18 ! 0x0013, 0x0008, 0x0003, 0x001a, 0x0007, 0x0014, 0x0005, 0x0002, // 0x20 ! 0x0005, 0x0001, 0x0005, 0x0002, 0x0002, 0x0011, 0x000f, 0x000a, // 0x28 ! 0x0005, 0x0001, 0x0002, 0x0002, 0x000a, 0x028d, 0x0000, 0x0008, // 0x30 ! 0x0007, 0x0009, 0x0000, 0x0000, 0x0000, 0x0002, 0x0025, 0x0000, // 0x38 ! 0x00c9, 0x0000, 0x0000, 0x0229, 0x02c9, 0x0005, 0x0000, 0x000b, // 0x40 ! 0x0049, 0x005d, 0x0005, 0x0009, 0x0000, 0x0000, 0x0006, 0x0002, // 0x48 ! 0x0000, 0x0000, 0x0000, 0x0002, 0x000c, 0x0001, 0x000b, 0x006e, // 0x50 ! 0x006a, 0x0000, 0x0000, 0x0004, 0x0002, 0x0049, 0x0000, 0x0031, // 0x58 ! 0x0005, 0x0009, 0x000f, 0x000d, 0x0001, 0x0004, 0x0000, 0x0015, // 0x60 ! 0x0000, 0x0000, 0x0003, 0x0009, 0x0013, 0x0003, 0x000e, 0x0000, // 0x68 ! 0x001c, 0x0000, 0x0005, 0x0002, 0x0000, 0x0023, 0x0010, 0x0011, // 0x70 ! 0x0000, 0x0009, 0x0000, 0x0002, 0x0000, 0x000d, 0x0002, 0x0000, // 0x78 ! 0x003e, 0x0000, 0x0002, 0x0027, 0x0045, 0x0002, 0x0000, 0x0000, // 0x80 ! 0x0042, 0x0000, 0x0000, 0x0000, 0x000b, 0x0000, 0x0000, 0x0000, // 0x88 ! 0x0013, 0x0041, 0x0000, 0x0063, 0x0000, 0x0009, 0x0000, 0x0002, // 0x90 ! 0x0000, 0x001a, 0x0000, 0x0102, 0x0135, 0x0033, 0x0000, 0x0000, // 0x98 ! 0x0003, 0x0009, 0x0009, 0x0009, 0x0095, 0x0000, 0x0000, 0x0004, // 0xA0 ! 0x0000, 0x0000, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x000d, // 0xA8 ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0040, 0x0009, 0x0000, // 0xB0 ! 0x0000, 0x0003, 0x0006, 0x0009, 0x0003, 0x0000, 0x0000, 0x0000, // 0xB8 ! 0x0024, 0x0000, 0x0000, 0x0000, 0x0006, 0x00cb, 0x0001, 0x0031, // 0xC0 ! 0x0002, 0x0006, 0x0006, 0x0007, 0x0000, 0x0001, 0x0000, 0x004e, // 0xC8 ! 0x0000, 0x0002, 0x0019, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0xD0 ! 0x0000, 0x010C, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0xD8 ! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0xE0 ! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0xE8 ! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0xF0 ! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0xF8 }; *************** *** 402,406 **** { mapsMutex.lock(); // do not disturb me here. ! for ( const_iterator it(buffers.begin()); it != buffers.end(); ++it ) { // Read all avaliable data. --- 402,406 ---- { mapsMutex.lock(); // do not disturb me here. ! for ( const_iterator it( buffers.begin() ); it != buffers.end(); ++it ) { // Read all avaliable data. *************** *** 752,761 **** Requeues a packet to the front of the queue for a socket. */ ! void cAsyncNetIO::pushfrontPacket( QSocketDevice *socket, cUOPacket *packet ) { ! iterator it = buffers.find(socket); ! if (it != buffers.end()) { ! QMutexLocker lock(&(it.data()->packetsMutex)); ! it.data()->packets.push_front(packet); } } --- 752,763 ---- Requeues a packet to the front of the queue for a socket. */ ! void cAsyncNetIO::pushfrontPacket( QSocketDevice* socket, cUOPacket* packet ) ! { ! iterator it = buffers.find( socket ); ! if ( it != buffers.end() ) ! { ! QMutexLocker lock( &( it.data()->packetsMutex ) ); ! it.data()->packets.push_front( packet ); } } Index: uosocket.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.h,v retrieving revision 1.121 retrieving revision 1.122 diff -C2 -d -r1.121 -r1.122 *** uosocket.h 27 Jul 2004 06:35:22 -0000 1.121 --- uosocket.h 10 Aug 2004 03:24:29 -0000 1.122 *************** *** 222,226 **** void handleExtendedStats( cUORxExtendedStats* packet ); void handleAction( cUORxAction* packet ); ! void handleAllNames( cUORxAllNames *packet ); void handleGumpResponse( cUORxGumpResponse* packet ); void handleHelpRequest( cUORxHelpRequest* packet ); --- 222,226 ---- void handleExtendedStats( cUORxExtendedStats* packet ); void handleAction( cUORxAction* packet ); ! void handleAllNames( cUORxAllNames* packet ); void handleGumpResponse( cUORxGumpResponse* packet ); void handleHelpRequest( cUORxHelpRequest* packet ); Index: encryption.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/encryption.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** encryption.cpp 2 Jun 2004 15:04:09 -0000 1.2 --- encryption.cpp 10 Aug 2004 03:24:29 -0000 1.3 *************** *** 181,189 **** static const UINT8 xorData[0x10] = { ! // Seed: 7F000001 ! //0x05, 0x92, 0x66, 0x23, 0x67, 0x14, 0xE3, 0x62, 0xDC, 0x60, 0x8C, 0xD6, 0xFE, 0x7C, 0x25, 0x69 ! // Seed: FFFFFFFF ! 0xa9, 0xd5, 0x7d, 0xa4, 0x3e, 0x0c, 0x22, 0xda, 0xde, 0x15, 0xe9, 0x92, 0xdd, 0x99, 0x98, 0x4d }; --- 181,189 ---- static const UINT8 xorData[0x10] = { ! // Seed: 7F000001 ! //0x05, 0x92, 0x66, 0x23, 0x67, 0x14, 0xE3, 0x62, 0xDC, 0x60, 0x8C, 0xD6, 0xFE, 0x7C, 0x25, 0x69 ! // Seed: FFFFFFFF ! 0xa9, 0xd5, 0x7d, 0xa4, 0x3e, 0x0c, 0x22, 0xda, 0xde, 0x15, 0xe9, 0x92, 0xdd, 0x99, 0x98, 0x4d }; Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.388 retrieving revision 1.389 diff -C2 -d -r1.388 -r1.389 *** uosocket.cpp 7 Aug 2004 15:32:59 -0000 1.388 --- uosocket.cpp 10 Aug 2004 03:24:29 -0000 1.389 *************** *** 106,110 **** PyObject* cUOSocket::handlers[255] = { ! 0, }; --- 106,110 ---- PyObject* cUOSocket::handlers[255] = { ! 0, }; *************** *** 262,272 **** // This is always checked before anything else ! if (packetId == 0x02 && Config::instance()->antiSpeedHack()) { ! if (_player && !_player->isGM()) { // There are two different delays for mounted and unmounted players unsigned int delay; ! if (!_player->atLayer(cBaseChar::Mount)) { delay = Config::instance()->antiSpeedHackDelay(); ! } else { delay = Config::instance()->antiSpeedHackDelayMounted(); } --- 262,277 ---- // This is always checked before anything else ! if ( packetId == 0x02 && Config::instance()->antiSpeedHack() ) ! { ! if ( _player && !_player->isGM() ) ! { // There are two different delays for mounted and unmounted players unsigned int delay; ! if ( !_player->atLayer( cBaseChar::Mount ) ) ! { delay = Config::instance()->antiSpeedHackDelay(); ! } ! else ! { delay = Config::instance()->antiSpeedHackDelayMounted(); } *************** *** 276,282 **** //unsigned int time = getNormalizedTime(); unsigned int time = Server::instance()->time(); ! if (_player->lastMovement() + delay > time) { //sysMessage(QString("Delayed Walk Request, Last WalkRequest was %1 ms ago.").arg(time - _player->lastMovement())); ! Network::instance()->netIo()->pushfrontPacket(_socket, packet); return; } --- 281,288 ---- //unsigned int time = getNormalizedTime(); unsigned int time = Server::instance()->time(); ! if ( _player->lastMovement() + delay > time ) ! { //sysMessage(QString("Delayed Walk Request, Last WalkRequest was %1 ms ago.").arg(time - _player->lastMovement())); ! Network::instance()->netIo()->pushfrontPacket( _socket, packet ); return; } *************** *** 360,364 **** handleServerAttach( dynamic_cast<cUORxServerAttach*>( packet ) ); break; case 0x98: ! handleAllNames(dynamic_cast<cUORxAllNames*>(packet)); break; case 0x9B: handleHelpRequest( dynamic_cast<cUORxHelpRequest*>( packet ) ); break; --- 366,370 ---- handleServerAttach( dynamic_cast<cUORxServerAttach*>( packet ) ); break; case 0x98: ! handleAllNames( dynamic_cast<cUORxAllNames*>( packet ) ); break; case 0x9B: handleHelpRequest( dynamic_cast<cUORxHelpRequest*>( packet ) ); break; *************** *** 444,448 **** void cUOSocket::handleHardwareInfo( cUORxHardwareInfo* packet ) { ! Q_UNUSED(packet); // Do something with the retrieved hardware information here // > Hardware Log ?? --- 450,454 ---- void cUOSocket::handleHardwareInfo( cUORxHardwareInfo* packet ) { ! Q_UNUSED( packet ); // Do something with the retrieved hardware information here // > Hardware Log ?? *************** *** 548,552 **** clientFeatures.setLbr( true ); clientFeatures.setT2a( true ); ! clientFeatures.setShort( 1, 0xFFFF ); // AoS TEST send( &clientFeatures ); --- 554,559 ---- clientFeatures.setLbr( true ); clientFeatures.setT2a( true ); ! //clientFeatures.setShort( 1, 0xFFFF ); // AoS TEST ! clientFeatures.setShort(1, 0x1F); send( &clientFeatures ); *************** *** 568,576 **** charList.compile(); send( &charList ); ! #pragma fixme("Warning: Ugly ugly ugly! Fix me!") // Ask the client for a viewrange ! cUOPacket packet( 0xc8, 2 ); ! packet[1] = VISRANGE; ! send( &packet ); } --- 575,583 ---- charList.compile(); send( &charList ); ! // Ask the client for a viewrange ! cUOTxUpdateRange range; ! range.setRange(VISRANGE); ! send( &range ); } *************** *** 659,667 **** // Enable Sta+Map Diffs cUOTxMapDiffs diffs; ! diffs.addEntry(Maps::instance()->mapPatches(0), Maps::instance()->staticPatches(0)); ! diffs.addEntry(Maps::instance()->mapPatches(1), Maps::instance()->staticPatches(1)); ! diffs.addEntry(Maps::instance()->mapPatches(2), Maps::instance()->staticPatches(2)); ! diffs.addEntry(Maps::instance()->mapPatches(3), Maps::instance()->staticPatches(3)); ! send(&diffs); // Which map are we on --- 666,674 ---- // Enable Sta+Map Diffs cUOTxMapDiffs diffs; ! diffs.addEntry( Maps::instance()->mapPatches( 0 ), Maps::instance()->staticPatches( 0 ) ); ! diffs.addEntry( Maps::instance()->mapPatches( 1 ), Maps::instance()->staticPatches( 1 ) ); ! diffs.addEntry( Maps::instance()->mapPatches( 2 ), Maps::instance()->staticPatches( 2 ) ); ! diffs.addEntry( Maps::instance()->mapPatches( 3 ), Maps::instance()->staticPatches( 3 ) ); ! send( &diffs ); // Which map are we on *************** *** 829,836 **** // If we have more than 6 characters ! const uint maxChars = QMIN(6, Config::instance()->maxCharsPerAccount() ); if ( characters.size() >= maxChars ) { ! cancelCreate( tr( "You already have more than %1 characters" ).arg(maxChars) ) } --- 836,843 ---- // If we have more than 6 characters ! const uint maxChars = QMIN( 6, Config::instance()->maxCharsPerAccount() ); if ( characters.size() >= maxChars ) { ! cancelCreate( tr( "You already have more than %1 characters" ).arg( maxChars ) ) } *************** *** 908,912 **** if ( playerDefinition ) pChar->applyDefinition( playerDefinition ); ! pChar->setName( packet->name() ); --- 915,919 ---- if ( playerDefinition ) pChar->applyDefinition( playerDefinition ); ! pChar->setName( packet->name() ); *************** *** 1244,1248 **** handleCHRevert( packet ); break; /* case cUORxAosMultiPurpose::AbilitySelect: ! handleAbilitySelect( dynamic_cast< */ default: Console::instance()->log( LOG_WARNING, packet->dump( packet->uncompressed() ) ); --- 1251,1255 ---- handleCHRevert( packet ); break; /* case cUORxAosMultiPurpose::AbilitySelect: ! handleAbilitySelect( dynamic_cast< */ default: Console::instance()->log( LOG_WARNING, packet->dump( packet->uncompressed() ) ); *************** *** 1253,1297 **** void cUOSocket::handleCHBackup( cUORxAosMultiPurpose* packet ) { ! Q_UNUSED(packet); } void cUOSocket::handleCHRestore( cUORxAosMultiPurpose* packet ) { ! Q_UNUSED(packet); } void cUOSocket::handleCHCommit( cUORxAosMultiPurpose* packet ) { ! Q_UNUSED(packet); } void cUOSocket::handleCHDelete( cUORxCHDelete* packet ) { ! Q_UNUSED(packet); } void cUOSocket::handleCHAddElement( cUORxCHAddElement* packet ) { ! Q_UNUSED(packet); } void cUOSocket::handleCHClose( cUORxAosMultiPurpose* packet ) { ! Q_UNUSED(packet); } void cUOSocket::handleCHStairs( cUORxCHStairs* packet ) { ! Q_UNUSED(packet); } void cUOSocket::handleCHSync( cUORxAosMultiPurpose* packet ) { ! Q_UNUSED(packet); } void cUOSocket::handleCHClear( cUORxAosMultiPurpose* packet ) { ! Q_UNUSED(packet); } --- 1260,1304 ---- void cUOSocket::handleCHBackup( cUORxAosMultiPurpose* packet ) { ! Q_UNUSED( packet ); } void cUOSocket::handleCHRestore( cUORxAosMultiPurpose* packet ) { ! Q_UNUSED( packet ); } void cUOSocket::handleCHCommit( cUORxAosMultiPurpose* packet ) { ! Q_UNUSED( packet ); } void cUOSocket::handleCHDelete( cUORxCHDelete* packet ) { ! Q_UNUSED( packet ); } void cUOSocket::handleCHAddElement( cUORxCHAddElement* packet ) { ! Q_UNUSED( packet ); } void cUOSocket::handleCHClose( cUORxAosMultiPurpose* packet ) { ! Q_UNUSED( packet ); } void cUOSocket::handleCHStairs( cUORxCHStairs* packet ) { ! Q_UNUSED( packet ); } void cUOSocket::handleCHSync( cUORxAosMultiPurpose* packet ) { ! Q_UNUSED( packet ); } void cUOSocket::handleCHClear( cUORxAosMultiPurpose* packet ) { ! Q_UNUSED( packet ); } *************** *** 1303,1307 **** void cUOSocket::handleCHRevert( cUORxAosMultiPurpose* packet ) { ! Q_UNUSED(packet); } --- 1310,1314 ---- void cUOSocket::handleCHRevert( cUORxAosMultiPurpose* packet ) { ! Q_UNUSED( packet ); } *************** *** 1531,1535 **** changemap.setMap(pos_.map); socket_->send(&changemap); - cUOTxChangeServer changeserver; changeserver.setX(pos_.x); --- 1538,1541 ---- *************** *** 1540,1550 **** socket_->send(&changeserver); } - updatePlayer(); - // Send the equipment Tooltips cBaseChar::ItemContainer content = _player->content(); cBaseChar::ItemContainer::const_iterator it; - for (it = content.begin(); it != content.end(); it++) { P_ITEM pItem = it.data(); --- 1546,1553 ---- *************** *** 1554,1560 **** } } - updateLightLevel(); - // Set the warmode status if (!quick) { --- 1557,1561 ---- *************** *** 1989,1993 **** } ! if ( pCont->objectID() == QString("cCorpse") ) { cCorpse* pCorpse = dynamic_cast<cCorpse*>( pCont ); --- 1990,1994 ---- } ! if ( pCont->objectID() == QString( "cCorpse" ) ) { cCorpse* pCorpse = dynamic_cast<cCorpse*>( pCont ); *************** *** 2580,2587 **** // change how the name is displayed /*QString name = mItem->getName(true); ! name[0] = name[0].upper(); ! for ( uint j = 1; j < name.length() - 1; ++j ) ! if ( name.at(j).isSpace() ) ! name.at(j+1) = name.at(j+1).upper();*/ items.append( mItem ); --- 2581,2588 ---- // change how the name is displayed /*QString name = mItem->getName(true); ! name[0] = name[0].upper(); ! for ( uint j = 1; j < name.length() - 1; ++j ) ! if ( name.at(j).isSpace() ) ! name.at(j+1) = name.at(j+1).upper();*/ items.append( mItem ); *************** *** 3230,3242 **** } ! void cUOSocket::handleAllNames(cUORxAllNames *packet) { ! cUObject *object = World::instance()->findObject(packet->serial()); // Send a packet back with the name of the requested object ! if (object) { cUOTxAllNames allnames; ! allnames.setSerial(object->serial()); ! allnames.setName(object->name()); ! send(&allnames); } } --- 3231,3245 ---- } ! void cUOSocket::handleAllNames( cUORxAllNames* packet ) ! { ! cUObject* object = World::instance()->findObject( packet->serial() ); // Send a packet back with the name of the requested object ! if ( object ) ! { cUOTxAllNames allnames; ! allnames.setSerial( object->serial() ); ! allnames.setName( object->name() ); ! send( &allnames ); } } Index: uotxpackets.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.cpp,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** uotxpackets.cpp 27 Jul 2004 06:35:22 -0000 1.99 --- uotxpackets.cpp 10 Aug 2004 03:24:29 -0000 1.100 *************** *** 366,370 **** bool layers[0x20] = { ! 0, }; --- 366,370 ---- bool layers[0x20] = { ! 0, }; Index: asyncnetio.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/asyncnetio.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** asyncnetio.h 22 Jul 2004 13:38:32 -0000 1.18 --- asyncnetio.h 10 Aug 2004 03:24:29 -0000 1.19 *************** *** 61,65 **** cUOPacket* recvPacket( QSocketDevice* ); ! void pushfrontPacket( QSocketDevice*, cUOPacket *packet ); void sendPacket( QSocketDevice*, cUOPacket*, bool ); --- 61,65 ---- cUOPacket* recvPacket( QSocketDevice* ); ! void pushfrontPacket( QSocketDevice*, cUOPacket* packet ); void sendPacket( QSocketDevice*, cUOPacket*, bool ); |
