[wpdev-commits] wolfpack dragdrop.cpp,1.206,1.207 player.cpp,1.49,1.50 player.h,1.25,1.26

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

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

Modified Files:
	dragdrop.cpp player.cpp player.h 
Log Message:
secure trading code support for python

Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.206
retrieving revision 1.207
diff -C2 -d -r1.206 -r1.207
*** dragdrop.cpp	24 Nov 2003 20:27:27 -0000	1.206
--- dragdrop.cpp	25 Nov 2003 19:41:30 -0000	1.207
***************
*** 527,531 ****
  	if( pOtherChar->objectType() == enPlayer && dynamic_cast<P_PLAYER>(pOtherChar)->socket() )
  	{
! 		dynamic_cast<P_PLAYER>(pChar)->onTradeStart( dynamic_cast<P_PLAYER>(pOtherChar) );
  		// Check if we're already trading, 
  		// if not create a new window
--- 527,531 ----
  	if( pOtherChar->objectType() == enPlayer && dynamic_cast<P_PLAYER>(pOtherChar)->socket() )
  	{
! 		dynamic_cast<P_PLAYER>(pChar)->onTradeStart( dynamic_cast<P_PLAYER>(pOtherChar), pItem );
  		// Check if we're already trading, 
  		// if not create a new window

Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** player.cpp	24 Nov 2003 20:27:27 -0000	1.49
--- player.cpp	25 Nov 2003 19:41:30 -0000	1.50
***************
*** 1270,1274 ****
  }
  
! bool cPlayer::onTradeStart( P_PLAYER partner )
  {
  	cPythonScript *global = ScriptManager::instance()->getGlobalHook( EVENT_TRADESTART );
--- 1270,1274 ----
  }
  
! bool cPlayer::onTradeStart( P_PLAYER partner, P_ITEM firstitem )
  {
  	cPythonScript *global = ScriptManager::instance()->getGlobalHook( EVENT_TRADESTART );
***************
*** 1277,1281 ****
  	if( scriptChain || global )
  	{
! 		PyObject *args = Py_BuildValue( "(O&O&)", PyGetCharObject, this, PyGetCharObject, partner );
  
  		result = cPythonScript::callChainedEventHandler( EVENT_TRADESTART, scriptChain, args );
--- 1277,1281 ----
  	if( scriptChain || global )
  	{
! 		PyObject *args = Py_BuildValue( "(O&O&O&)", PyGetCharObject, this, PyGetCharObject, partner, PyGetItemObject, firstitem );
  
  		result = cPythonScript::callChainedEventHandler( EVENT_TRADESTART, scriptChain, args );

Index: player.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** player.h	24 Nov 2003 20:27:27 -0000	1.25
--- player.h	25 Nov 2003 19:41:30 -0000	1.26
***************
*** 115,119 ****
  	bool onPickup( P_ITEM pItem );
  	bool onTrade( unsigned int type, unsigned int buttonstate, SERIAL itemserial );
! 	bool onTradeStart( P_PLAYER partner );
  
  	// getters
--- 115,119 ----
  	bool onPickup( P_ITEM pItem );
  	bool onTrade( unsigned int type, unsigned int buttonstate, SERIAL itemserial );
! 	bool onTradeStart( P_PLAYER partner, P_ITEM firstitem );
  
  	// getters