[wpdev-commits] wolfpack ChangeLog,1.72,1.73 trade.cpp,1.11,1.12

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

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13478

Modified Files:
	ChangeLog trade.cpp 
Log Message:
Fixed a crashbug.

Index: trade.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/trade.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** trade.cpp	25 Aug 2004 17:01:23 -0000	1.11
--- trade.cpp	22 Sep 2004 04:09:31 -0000	1.12
***************
*** 58,69 ****
  void Trade::buyAction( cUOSocket* socket, cUORxBuy* packet )
  {
  	P_PLAYER pChar = socket->player();
- 	P_NPC pVendor = dynamic_cast<P_NPC>( FindCharBySerial( packet->serial() ) );
  
! 	cUOTxClearBuy clearBuy;
! 	clearBuy.setSerial( pVendor->serial() );
  
! 	if ( !pChar || !pVendor || pVendor->free || pChar->free )
! 	{
  		socket->send( &clearBuy );
  		return;
--- 58,74 ----
  void Trade::buyAction( cUOSocket* socket, cUORxBuy* packet )
  {
+ 	cUOTxClearBuy clearBuy;
+ 	clearBuy.setSerial( packet->serial() );
+ 
  	P_PLAYER pChar = socket->player();
  
! 	if ( !pChar || pChar->free ) {
! 		socket->send( &clearBuy );
! 		return;
! 	}
  
! 	P_NPC pVendor = dynamic_cast<P_NPC>( FindCharBySerial( packet->serial() ) );
! 
! 	if (!pVendor || pVendor->free) {
  		socket->send( &clearBuy );
  		return;
***************
*** 247,251 ****
  
  	cUOTxClearBuy clearBuy;
! 	clearBuy.setSerial( pVendor->serial() );
  
  	if ( !pChar || !pVendor || pVendor->free || pChar->free )
--- 252,256 ----
  
  	cUOTxClearBuy clearBuy;
! 	clearBuy.setSerial( packet->serial() );
  
  	if ( !pChar || !pVendor || pVendor->free || pChar->free )

Index: ChangeLog
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** ChangeLog	21 Sep 2004 07:44:25 -0000	1.72
--- ChangeLog	22 Sep 2004 04:09:31 -0000	1.73
***************
*** 45,48 ****
--- 45,49 ----
  	- Fixed a base definition bug related to property not loading the base definition.
  	- Fixed a bug with multis that would be put into themselves if moved.
+ 	- Fixed a crashbug related to vendors.
  
  Wolfpack 12.9.10 Beta (10. September 2004)