[wpdev-commits] wolfpack/network uorxpackets.cpp,1.52,1.53 uorxpackets.h,1.52,1.53 uosocket.cpp,1.298,1.299 uosocket.h,1.98,1.99

[<co...@us...>]

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

Modified Files:
	uorxpackets.cpp uorxpackets.h uosocket.cpp uosocket.h 
Log Message:
tradewindow

Index: uorxpackets.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uorxpackets.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** uorxpackets.cpp	15 Sep 2003 19:56:54 -0000	1.52
--- uorxpackets.cpp	24 Nov 2003 20:27:28 -0000	1.53
***************
*** 65,68 ****
--- 65,69 ----
  	case 0x66:		return new cUORxBookPage( data );
  	case 0x6C:		return new cUORxTarget( data );
+ 	case 0x6F:		return new cUORxSecureTrading( data );
  	case 0x72:		return new cUORxChangeWarmode( data );
  	case 0x73:		return new cUORxPing( data );

Index: uorxpackets.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uorxpackets.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** uorxpackets.h	15 Sep 2003 19:56:54 -0000	1.52
--- uorxpackets.h	24 Nov 2003 20:27:28 -0000	1.53
***************
*** 435,438 ****
--- 435,448 ----
  };
  
+ // 0x6F Secure Trading
+ class cUORxSecureTrading : public cUOPacket
+ {
+ public:
+ 	cUORxSecureTrading( const QByteArray &data ): cUOPacket( data ) {}
+ 	uchar type() const			{ return (*this)[3]; }
+ 	uint itemserial() const			{ return getInt( 4 ); }
+ 	uchar buttonstate() const		{ return (*this)[11]; }
+ };
+ 
  // 0x22 ResyncWalk
  class cUORxResyncWalk: public cUOPacket
***************
*** 486,489 ****
--- 496,500 ----
  	QStringList lines();
  };
+ 
  
  // 0xB1 Gump Response

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.298
retrieving revision 1.299
diff -C2 -d -r1.298 -r1.299
*** uosocket.cpp	24 Nov 2003 02:36:10 -0000	1.298
--- uosocket.cpp	24 Nov 2003 20:27:28 -0000	1.299
***************
*** 257,260 ****
--- 257,262 ----
  	case 0x6c:
  		handleTarget( dynamic_cast< cUORxTarget* >( packet ) ); break;
+ 	case 0x6F:
+  		handleSecureTrading( dynamic_cast< cUORxSecureTrading* >( packet ) ); break;
  	case 0x72:
  		handleChangeWarmode( dynamic_cast< cUORxChangeWarmode* >( packet ) ); break;
***************
*** 2164,2167 ****
--- 2166,2175 ----
  		return false;
  	return ( socket->player()->dist( _player ) < socket->player()->visualRange() );
+ }
+ 
+ void cUOSocket::handleSecureTrading( cUORxSecureTrading *packet )
+ {
+ //	Trade::trademsg( this, packet );
+ 	this->player()->onTrade( packet->type(), packet->buttonstate(), packet->itemserial() );
  }
  

Index: uosocket.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.h,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** uosocket.h	23 Nov 2003 03:46:22 -0000	1.98
--- uosocket.h	24 Nov 2003 20:27:28 -0000	1.99
***************
*** 132,135 ****
--- 132,136 ----
  
  	// Handler
+ 	void handleSecureTrading( cUORxSecureTrading* packet );
  	void handleLoginRequest( cUORxLoginRequest *packet );
  	void handleHardwareInfo( cUORxHardwareInfo *packet );