[wpdev-commits] wolfpack/network uosocket.cpp,1.304,1.305

[<dar...@pr...>]

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

Modified Files:
	uosocket.cpp 
Log Message:
Redid parts of the tooltip implementation.

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.304
retrieving revision 1.305
diff -C2 -d -r1.304 -r1.305
*** uosocket.cpp	28 Jan 2004 02:18:14 -0000	1.304
--- uosocket.cpp	29 Jan 2004 23:56:34 -0000	1.305
***************
*** 1091,1135 ****
  }
  
! void cUOSocket::handleToolTip( cUORxRequestToolTip *packet )
  {
! 	P_CHAR pChar;
! 	P_ITEM pItem;
! 	cUOTxTooltipList tooltips;
! 	bool result;
  	
! 	pItem = FindItemBySerial( packet->serial() );
! 	if( pItem )
! 	{
! 		tooltips.setSerial(pItem->serial());
! 		tooltips.setId(pItem->getTooltip());
! 
! 		if(!pItem->onShowTooltip(this->player(),&tooltips)) // just for test if object haven't tooltip
! 		{
! 			if( pItem->name().isNull() || pItem->name().isEmpty() )
! 			{
! 				if( pItem->amount() > 1 )
! 					tooltips.addLine( 0x1005bd, " \t#" + QString::number( 0xF9060 + pItem->id() ) + "\t: " + QString::number( pItem->amount() ) );
! 				else
! 					tooltips.addLine( 0xF9060 + pItem->id(), "" );
! 			}
! 			else
! 				tooltips.addLine( 0x1005bd, " \t" + pItem->name() + "\t " );
! 
! 			this->send( &tooltips );
! 		}
! 	}
! 	else
! 	{
! 		pChar = FindCharBySerial( packet->serial() );
! 		if( !pChar ) 
! 			return;
! 
! 		tooltips.setSerial( pChar->serial() );
! 		tooltips.setId( pChar->getTooltip() );
! 		if( !pChar->onShowTooltip( this->player(), &tooltips ) )
! 		{
! 			tooltips.addLine( 0x1005bd, " \t" + pChar->name() + "\t " );
! 			this->send( &tooltips );
! 		}
  	}
  }
--- 1091,1102 ----
  }
  
! void cUOSocket::handleToolTip(cUORxRequestToolTip *packet)
  {
! 	cUOTxTooltipList tooltip;
! 	cUObject *object = World::instance()->findObject(packet->serial());
  	
! 	if (object && player()) {
! 		object->createTooltip(tooltip, player());
! 		send(&tooltip);
  	}
  }