Update of /cvsroot/wpdev/wolfpack/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29692/network
Modified Files:
uosocket.cpp
Log Message:
vendor code.
Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.415
retrieving revision 1.416
diff -C2 -d -r1.415 -r1.416
*** uosocket.cpp 19 Sep 2004 16:25:37 -0000 1.415
--- uosocket.cpp 22 Sep 2004 05:34:47 -0000 1.416
***************
*** 2689,2695 ****
while ( pit != packcont.end() )
{
! if ( *pit && ( *pit )->id() == mItem->id() && ( *pit )->color() == mItem->color() && ( *pit )->baseid() == mItem->baseid() )
{
! itemContent.addItem( ( *pit )->serial(), ( *pit )->id(), ( *pit )->color(), ( *pit )->amount(), mItem->sellprice(), ( *pit )->getName() );
items.append( ( *pit ) );
}
--- 2689,2696 ----
while ( pit != packcont.end() )
{
! if ( *pit && ( *pit )->baseid() == mItem->baseid() && ( *pit )->scriptList() == mItem->scriptList() )
{
! unsigned int sellprice = mItem->getSellPrice(pVendor);
! itemContent.addItem( ( *pit )->serial(), ( *pit )->id(), ( *pit )->color(), ( *pit )->amount(), sellprice, ( *pit )->getName() );
items.append( ( *pit ) );
}
|
