[wpdev-commits] wolfpack Trade.cpp,1.92,1.93 contextmenu.h,1.14,1.15 npc.cpp,1.58,1.59 npc.h,1.30,1.31 targetrequests.h,1.51,1.52

[<thi...@pr...>]

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

Modified Files:
	Trade.cpp contextmenu.h npc.cpp npc.h targetrequests.h 
Log Message:
no message

Index: Trade.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/Trade.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** Trade.cpp	28 Jan 2004 02:18:13 -0000	1.92
--- Trade.cpp	31 Jan 2004 04:36:20 -0000	1.93
***************
*** 188,192 ****
  		if ( pChar->CountGold() < totalValue )
  		{
! 			pVendor->talk( 500192, 0, 0xFFFF, pChar->socket() ); //Begging thy pardon, but thou casnt afford that.
  			return;
  		}
--- 188,192 ----
  		if ( pChar->CountGold() < totalValue )
  		{
! 			pVendor->talk( 500192, 0, 0, false, 0xFFFF, pChar->socket() ); //Begging thy pardon, but thou casnt afford that.
  			return;
  		}
***************
*** 196,200 ****
  		if ( pChar->CountBankGold() < totalValue )
  		{
! 			pVendor->talk( 500191, 0, 0xFFFF, pChar->socket() ); //Begging thy pardon, but thy bank account lacks these funds.
  			return;
  		}
--- 196,200 ----
  		if ( pChar->CountBankGold() < totalValue )
  		{
! 			pVendor->talk( 500191, 0, 0, false, 0xFFFF, pChar->socket() ); //Begging thy pardon, but thy bank account lacks these funds.
  			return;
  		}
***************
*** 205,209 ****
  	{
  		socket->send( &clearBuy );
! 		pVendor->talk( 500190, 0, 0xFFFF, pChar->socket() ); // Thou hast bought nothing!
  		return;
  	}
--- 205,209 ----
  	{
  		socket->send( &clearBuy );
! 		pVendor->talk( 500190, 0, 0, false, 0xFFFF, pChar->socket() ); // Thou hast bought nothing!
  		return;
  	}

Index: contextmenu.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/contextmenu.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** contextmenu.h	28 Jan 2004 02:18:13 -0000	1.14
--- contextmenu.h	31 Jan 2004 04:36:20 -0000	1.15
***************
*** 59,63 ****
  	
  	cContextMenuEntry( ushort cliloc, ushort scriptTag, ushort color = 0, bool checkvisible = false, bool checkenabled = false ) : 
! 	cliloc_( cliloc ), scriptTag_(scriptTag), flags_ ( 0 ), color_(0), checkvisible_(checkvisible_), checkenabled_(checkenabled)
  	{
  		flags_ |= ( color_ & 0xFFFF ) ? 32 : 0;
--- 59,63 ----
  	
  	cContextMenuEntry( ushort cliloc, ushort scriptTag, ushort color = 0, bool checkvisible = false, bool checkenabled = false ) : 
! 	cliloc_( cliloc ), flags_ ( 0 ), color_(0), scriptTag_(scriptTag), checkvisible_(checkvisible_), checkenabled_(checkenabled)
  	{
  		flags_ |= ( color_ & 0xFFFF ) ? 32 : 0;
***************
*** 65,69 ****
  	
  	bool isEnabled() const	{ return !(flags_ & 0x0001); }
! 	bool setEnabled( bool enable )
  	{
  		flags_ = enable ? flags_ & ~0x0001 : flags_ | 0x0001;
--- 65,69 ----
  	
  	bool isEnabled() const	{ return !(flags_ & 0x0001); }
! 	void setEnabled( bool enable )
  	{
  		flags_ = enable ? flags_ & ~0x0001 : flags_ | 0x0001;

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** npc.cpp	30 Jan 2004 23:28:42 -0000	1.58
--- npc.cpp	31 Jan 2004 04:36:20 -0000	1.59
***************
*** 353,361 ****
  }
  
! void cNPC::talk( const UINT32 MsgID, const QString& params /*= 0*/, UI16 color /*= 0xFFFF*/, cUOSocket* socket /*= 0*/ )
  {
  	if ( socket )
  	{
! 		socket->clilocMessage( MsgID, params, color, 3, this );
  	}
  	else
--- 353,367 ----
  }
  
! void cNPC::talk( const UINT32 MsgID, const QString& params /*= 0*/, const QString& affix /*= 0*/, bool prepend /*= false*/, UI16 color /*= 0xFFFF*/, cUOSocket* socket /*= 0*/ )
  {
+ 	if ( color == 0xFFFF )
+ 		color = saycolor_;
+ 	
  	if ( socket )
  	{
! 		if ( affix.isEmpty() )
! 			socket->clilocMessage( MsgID, params, color, 3, this );
! 		else
! 			socket->clilocMessageAffix( MsgID, params, affix, color, 3, this, false, prepend );
  	}
  	else
***************
*** 366,370 ****
  			if( mSock->player() && ( mSock->player()->dist( this ) < 18 ) )
  			{
! 				mSock->clilocMessage( MsgID, params, color, 3, this );
  			}
  		}
--- 372,379 ----
  			if( mSock->player() && ( mSock->player()->dist( this ) < 18 ) )
  			{
! 				if ( affix.isEmpty() )
! 					mSock->clilocMessage( MsgID, params, color, 3, this );
! 				else
! 					mSock->clilocMessageAffix( MsgID, params, affix, color, 3, this, false, prepend );
  			}
  		}

Index: npc.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** npc.h	30 Jan 2004 22:11:52 -0000	1.30
--- npc.h	31 Jan 2004 04:36:20 -0000	1.31
***************
*** 93,97 ****
  	virtual void resend( bool clean = true, bool excludeself = false ); 
  	virtual void talk( const QString &message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL );
! 			void talk( const UINT32 MsgID, const QString& params = 0, UI16 color = 0xFFFF, cUOSocket* socket = 0 );
  	virtual UINT8 notority( P_CHAR pChar = NULL );
  	virtual void kill();
--- 93,97 ----
  	virtual void resend( bool clean = true, bool excludeself = false ); 
  	virtual void talk( const QString &message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL );
! 			void talk( const UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 );
  	virtual UINT8 notority( P_CHAR pChar = NULL );
  	virtual void kill();

Index: targetrequests.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** targetrequests.h	22 Jan 2004 22:33:14 -0000	1.51
--- targetrequests.h	31 Jan 2004 04:36:20 -0000	1.52
***************
*** 52,56 ****
  	bool nodecay;
  public:
! 	cAddItemTarget( const QString &item, bool _nodecay = false ) : nodecay( _nodecay ), item_(item) {}
  	bool responsed( cUOSocket *socket, cUORxTarget *target );
  };
--- 52,56 ----
  	bool nodecay;
  public:
! 	cAddItemTarget( const QString &item, bool _nodecay = false ) : item_(item), nodecay( _nodecay ) {}
  	bool responsed( cUOSocket *socket, cUORxTarget *target );
  };
***************
*** 70,74 ****
  	SERIAL	senderserial_;
  public:
! 	cBuildMultiTarget( const QString &multisection, SERIAL senderserial, SERIAL deedserial ) { multisection_ = multisection; senderserial_ = senderserial; deedserial_ = deedserial; };
  	bool responsed( cUOSocket *socket, cUORxTarget *target );
  };
--- 70,78 ----
  	SERIAL	senderserial_;
  public:
! 	cBuildMultiTarget( const QString &multisection, SERIAL senderserial, SERIAL deedserial ) : 
! 	  multisection_(multisection), deedserial_(deedserial), senderserial_(senderserial) 
! 	{
! 
! 	}
  	bool responsed( cUOSocket *socket, cUORxTarget *target );
  };