[wpdev-commits] wolfpack/network asyncnetio.cpp,1.32,1.33 uorxpackets.cpp,1.50,1.51 uorxpackets.h,1.49,1.50 uosocket.cpp,1.279,1.280 uosocket.h,1.91,1.92

[<dar...@us...>]

Update of /cvsroot/wpdev/wolfpack/network
In directory sc8-pr-cvs1:/tmp/cvs-serv10846/network

Modified Files:
	asyncnetio.cpp uorxpackets.cpp uorxpackets.h uosocket.cpp 
	uosocket.h 
Log Message:
Removed Books and Fixed Packetlengths.

Index: asyncnetio.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/asyncnetio.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** asyncnetio.cpp	22 Jul 2003 17:16:56 -0000	1.32
--- asyncnetio.cpp	30 Aug 2003 17:00:11 -0000	1.33
***************
*** 55,90 ****
  const Q_UINT16 packetLengths[256] =
  {
! 0x0068, 0x0005, 0x0007, 0x0000, 0x0002, 0x0005, 0x0005, 0x0007, // 0x07
! 0x000e, 0x0005, 0x000b, 0x010a, 0x0000, 0x0003, 0x0000, 0x003d, // 0x0F
! 0x00d7, 0x0000, 0x0000, 0x000a, 0x0006, 0x0009, 0x0001, 0x0000, // 0x17
! 0x0000, 0x0000, 0x0000, 0x0025, 0x0000, 0x0005, 0x0004, 0x0008, // 0x1F
! 0x0013, 0x0008, 0x0003, 0x001a, 0x0007, 0x0014, 0x0005, 0x0002, // 0x27
! 0x0005, 0x0001, 0x0005, 0x0002, 0x0002, 0x0011, 0x000f, 0x000a, // 0x2F
! 0x0005, 0x0001, 0x0002, 0x0002, 0x000a, 0x028d, 0x0000, 0x0008, // 0x37
! 0x0007, 0x0009, 0x0000, 0x0000, 0x0000, 0x0002, 0x0025, 0x0000, // 0x3F
! 0x00c9, 0x0000, 0x0000, 0x0229, 0x02c9, 0x0005, 0x0000, 0x000b, // 0x47
! 0x0049, 0x005d, 0x0005, 0x0009, 0x0000, 0x0000, 0x0006, 0x0002, // 0x4F
! 0x0000, 0x0000, 0x0000, 0x0002, 0x000c, 0x0001, 0x000b, 0x006e, // 0x57
! 0x006a, 0x0000, 0x0000, 0x0004, 0x0002, 0x0049, 0x0000, 0x0031, // 0x5F
! 0x0005, 0x0009, 0x000f, 0x000d, 0x0001, 0x0004, 0x0000, 0x0015, // 0x67
! 0x0000, 0x0000, 0x0003, 0x0009, 0x0013, 0x0003, 0x000e, 0x0000, // 0x6F
! 0x001c, 0x0000, 0x0005, 0x0002, 0x0000, 0x0023, 0x0010, 0x0011, // 0x77
! 0x0000, 0x0009, 0x0000, 0x0002, 0x0000, 0x000d, 0x0002, 0x0000, // 0x7F
! 0x003e, 0x0000, 0x0002, 0x0027, 0x0045, 0x0002, 0x0000, 0x0000, // 0x87
! 0x0042, 0x0000, 0x0000, 0x0000, 0x000b, 0x0000, 0x0000, 0x0000, // 0x8F
! 0x0013, 0x0041, 0x0000, 0x0063, 0x0000, 0x0009, 0x0000, 0x0002, // 0x97
! 0x0000, 0x001a, 0x0000, 0x0102, 0x0135, 0x0033, 0x0000, 0x0000, // 0x9F
! 0x0003, 0x0009, 0x0009, 0x0009, 0x0095, 0x0000, 0x0000, 0x0004, // 0xA7
! 0x0000, 0x0000, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x000d, // 0xAF
! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0040, 0x0009, 0x0000, // 0xB7
! 0x0000, 0x0003, 0x0006, 0x0009, 0x0003, 0x0000, 0x0000, 0x0000, // 0xBF
! 0x0024, 0x0000, 0x0000, 0x0000, 0x0006, 0xFFFF, 0xFFFF, 0xFFFF, // 0xC7
! 0x0002, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0xCF
! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 
! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 
! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 
! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 
! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 
! 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
  };
  
--- 55,90 ----
  const Q_UINT16 packetLengths[256] =
  {
! 0x0068, 0x0005, 0x0007, 0x0000, 0x0002, 0x0005, 0x0005, 0x0007,
! 0x000e, 0x0005, 0x000b, 0x010a, 0x0000, 0x0003, 0x0000, 0x003d,
! 0x00d7, 0x0000, 0x0000, 0x000a, 0x0006, 0x0009, 0x0001, 0x0000,
! 0x0000, 0x0000, 0x0000, 0x0025, 0x0000, 0x0005, 0x0004, 0x0008,
! 0x0013, 0x0008, 0x0003, 0x001a, 0x0007, 0x0014, 0x0005, 0x0002,
! 0x0005, 0x0001, 0x0005, 0x0002, 0x0002, 0x0011, 0x000f, 0x000a,
! 0x0005, 0x0001, 0x0002, 0x0002, 0x000a, 0x028d, 0x0000, 0x0008,
! 0x0007, 0x0009, 0x0000, 0x0000, 0x0000, 0x0002, 0x0025, 0x0000,
! 0x00c9, 0x0000, 0x0000, 0x0229, 0x02c9, 0x0005, 0x0000, 0x000b,
! 0x0049, 0x005d, 0x0005, 0x0009, 0x0000, 0x0000, 0x0006, 0x0002,
! 0x0000, 0x0000, 0x0000, 0x0002, 0x000c, 0x0001, 0x000b, 0x006e,
! 0x006a, 0x0000, 0x0000, 0x0004, 0x0002, 0x0049, 0x0000, 0x0031,
! 0x0005, 0x0009, 0x000f, 0x000d, 0x0001, 0x0004, 0x0000, 0x0015,
! 0x0000, 0x0000, 0x0003, 0x0009, 0x0013, 0x0003, 0x000e, 0x0000,
! 0x001c, 0x0000, 0x0005, 0x0002, 0x0000, 0x0023, 0x0010, 0x0011,
! 0x0000, 0x0009, 0x0000, 0x0002, 0x0000, 0x000d, 0x0002, 0x0000,
! 0x003e, 0x0000, 0x0002, 0x0027, 0x0045, 0x0002, 0x0000, 0x0000,
! 0x0042, 0x0000, 0x0000, 0x0000, 0x000b, 0x0000, 0x0000, 0x0000,
! 0x0013, 0x0041, 0x0000, 0x0063, 0x0000, 0x0009, 0x0000, 0x0002,
! 0x0000, 0x001a, 0x0000, 0x0102, 0x0135, 0x0033, 0x0000, 0x0000,
! 0x0003, 0x0009, 0x0009, 0x0009, 0x0095, 0x0000, 0x0000, 0x0004,
! 0x0000, 0x0000, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x000d,
! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0040, 0x0009, 0x0000,
! 0x0000, 0x0003, 0x0006, 0x0009, 0x0003, 0x0000, 0x0000, 0x0000,
! 0x0024, 0x0000, 0x0000, 0x0000, 0x0006, 0x00cb, 0x0001, 0x0031,
! 0x0002, 0x0006, 0x0006, 0x0007, 0x0000, 0x0001, 0x0000, 0x004e,
! 0x0000, 0x0002, 0x0019, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
! 0x0000, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
! 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
! 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
! 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
! 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
  };
  

Index: uorxpackets.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uorxpackets.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** uorxpackets.cpp	23 Jul 2003 22:39:07 -0000	1.50
--- uorxpackets.cpp	30 Aug 2003 17:00:12 -0000	1.51
***************
*** 71,75 ****
  	case 0x83:		return new cUORxDeleteCharacter( data );
  	case 0x91:		return new cUORxServerAttach( data );
- 	case 0x93:		return new cUORxUpdateBook( data );
  	case 0x95:		return new cUORxDye( data );
  	case 0x9B:		return new cUORxHelpRequest( data );
--- 71,74 ----
***************
*** 85,88 ****
--- 84,88 ----
  	case 0xB8:		return new cUORxProfile( data );
  	case 0xD7:		return cUORxAosMultiPurpose::packet( data );
+ 	case 0xD4:		return new cUORxBookInfo( data );
  	default:		return new cUOPacket( data );
  	};	

Index: uorxpackets.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uorxpackets.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** uorxpackets.h	22 Jul 2003 17:16:56 -0000	1.49
--- uorxpackets.h	30 Aug 2003 17:00:12 -0000	1.50
***************
*** 620,622 ****
--- 620,642 ----
  };
  
+ // 0xD4
+ class cUORxBookInfo : public cUOPacket
+ {
+ public:
+ 	cUORxBookInfo( const QByteArray &data ): cUOPacket( data ) {}
+ 	unsigned int serial() const			{ return getInt( 3 ); }
+ 	QString author() const
+ 	{ 
+ 		unsigned short length = getShort( 11 );
+ 		return this->getAsciiString( 13, length );
+ 	}
+ 	
+ 	QString title() const
+ 	{ 
+ 		unsigned short length1 = getShort( 11 );
+ 		unsigned short length2 = getShort( 13 + length1 );
+ 		return this->getAsciiString( 15 + length1, length2 );
+ 	}
+ };
+ 
  #endif // __UO_RXPACKETS__

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.279
retrieving revision 1.280
diff -C2 -d -r1.279 -r1.280
*** uosocket.cpp	29 Aug 2003 22:44:47 -0000	1.279
--- uosocket.cpp	30 Aug 2003 17:00:12 -0000	1.280
***************
*** 52,56 ****
  #include "../guildstones.h"
  #include "../combat.h"
- #include "../books.h"
  #include "../gumps.h"
  #include "../skills.h"
--- 52,55 ----
***************
*** 272,279 ****
  	case 0x91:
  		handleServerAttach( dynamic_cast< cUORxServerAttach* >( packet ) ); break;
! 	case 0x93:
! 		handleUpdateBook( dynamic_cast< cUORxUpdateBook* >( packet ) ); break;
! 	case 0x9B:
! 		handleHelpRequest( dynamic_cast< cUORxHelpRequest* >( packet ) ); break;
  	case 0x9F:
  		handleSell( dynamic_cast< cUORxSell* >( packet ) ); break;
--- 271,275 ----
  	case 0x91:
  		handleServerAttach( dynamic_cast< cUORxServerAttach* >( packet ) ); break;
! 	case 0x9B:	handleHelpRequest( dynamic_cast< cUORxHelpRequest* >( packet ) ); break;
  	case 0x9F:
  		handleSell( dynamic_cast< cUORxSell* >( packet ) ); break;
***************
*** 298,301 ****
--- 294,299 ----
  	case 0x95:
  		handleDye( dynamic_cast< cUORxDye* >( packet ) ); break;
+ 	case 0xD4:
+ 		handleUpdateBook( dynamic_cast< cUORxBookInfo* >( packet ) ); break;
  	default:
  		packet->print( &cout );
***************
*** 2124,2128 ****
  void cUOSocket::handleBookPage( cUORxBookPage* packet )
  {
! 	cBook* pBook = dynamic_cast< cBook* >(FindItemBySerial( packet->serial() ));
  	if( pBook )
  	{
--- 2122,2127 ----
  void cUOSocket::handleBookPage( cUORxBookPage* packet )
  {
! 	P_ITEM pBook = FindItemBySerial( packet->serial() );
! 	
  	if( pBook )
  	{
***************
*** 2130,2165 ****
  		{
  			// simple page request
! 			pBook->readPage( this, packet->page() );
  		}
! 		else if( pBook->writeable() )
  		{
! 			// page write request
! 			QStringList content_ = pBook->content();
! 			QStringList lines = packet->lines();
! 			
! 			QString toInsert = QString();
! 			QStringList::const_iterator it = lines.begin();
! 			while( it != lines.end() )
! 			{
! 				toInsert += (*it)+"\n";
! 				++it;
! 			}
! 
! 			UINT16 n = packet->page();
! 			while( content_.size() <= n )
! 				content_.push_back( "" );
! 			content_[ n - 1 ] = toInsert;
! 			pBook->setContent( content_ );
  		}
  	}	
  }
  
! void cUOSocket::handleUpdateBook( cUORxUpdateBook* packet )
  {
! 	cBook* pBook = dynamic_cast< cBook* >(FindItemBySerial( packet->serial() ));
! 	if( pBook && pBook->writeable() )
  	{
! 		pBook->setAuthor( packet->author() );
! 		pBook->setTitle( packet->title() );
  	}
  }
--- 2129,2147 ----
  		{
  			// simple page request
! 			pBook->onBookRequestPage( _player, packet->page() );
  		}
! 		else
  		{
! 			pBook->onBookUpdatePage( _player, packet->page(), packet->lines().join( "\n" ) );
  		}
  	}	
  }
  
! void cUOSocket::handleUpdateBook( cUORxBookInfo* packet )
  {
! 	P_ITEM pBook = FindItemBySerial( packet->serial() );
! 	if( pBook )
  	{
! 		pBook->onBookUpdateInfo( _player, packet->author(), packet->title() );
  	}
  }

Index: uosocket.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.h,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** uosocket.h	22 Jul 2003 17:16:56 -0000	1.91
--- uosocket.h	30 Aug 2003 17:00:13 -0000	1.92
***************
*** 158,162 ****
  	void handleRequestAttack( cUORxRequestAttack* packet );
  	void handleBookPage( cUORxBookPage* packet );
! 	void handleUpdateBook( cUORxUpdateBook* packet );
  	void handleAction( cUORxAction* packet );
  	void handleGumpResponse( cUORxGumpResponse* packet );
--- 158,162 ----
  	void handleRequestAttack( cUORxRequestAttack* packet );
  	void handleBookPage( cUORxBookPage* packet );
! 	void handleUpdateBook( cUORxBookInfo* packet );
  	void handleAction( cUORxAction* packet );
  	void handleGumpResponse( cUORxGumpResponse* packet );