[wpdev-commits] wolfpack/network uosocket.cpp,1.297,1.298

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

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

Modified Files:
	uosocket.cpp 
Log Message:
Removed some outdated properties and updated the vs.net project file. Started implementing the Base Definition property. Accessible via item.baseid in python you can now set and get the name of the definition this item was created from.

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.297
retrieving revision 1.298
diff -C2 -d -r1.297 -r1.298
*** uosocket.cpp	23 Sep 2003 12:40:19 -0000	1.297
--- uosocket.cpp	24 Nov 2003 02:36:10 -0000	1.298
***************
*** 760,797 ****
  	pChar->setSkillValue( packet->skillId3(), packet->skillValue3()*10 );
  
! 	// Create the char equipment (JUST the basics !!)
! 	P_ITEM pItem = new cItem;
! 	pItem->Init();
! 
  	// Shirt
! 	pItem->setId( 0x1517 );
  	pItem->setColor( packet->shirtColor() );
- 	pItem->setMaxhp( RandomNum( 25, 50 ) );
- 	pItem->setHp( pItem->maxhp() );
- 	pChar->addItem( cBaseChar::Shirt, pItem );	
- 	pItem->setDye(1);
  	pItem->setNewbie( true );
! 
! 	pItem = new cItem;
! 	pItem->Init();
  
  	// Skirt or Pants
! 	pItem->setId( ( packet->gender() != 0 ) ? 0x1516 : 0x152E );
  	pItem->setColor( packet->pantsColor() );
- 	pItem->setMaxhp( RandomNum( 25, 50 ) );
- 	pItem->setHp( pItem->maxhp() );
- 	pChar->addItem( cBaseChar::Pants, pItem );
- 	pItem->setDye(1);
  	pItem->setNewbie( true );
  
  	// Hair & Beard
  	if( packet->hairStyle() )
  	{
! 		pItem = new cItem;
! 		pItem->Init();
! 
! 		pItem->setDye(1);
  		pItem->setNewbie( true );
- 		pItem->setId( packet->hairStyle() );
  		pItem->setColor( packet->hairColor() );
  		pChar->addItem( cBaseChar::Hair, pItem );
--- 760,783 ----
  	pChar->setSkillValue( packet->skillId3(), packet->skillValue3()*10 );
  
! 	// Create the char equipment (shirt, paint, hair and beard only)
! 	P_ITEM pItem;
! 	
  	// Shirt
! 	pItem = cItem::createFromScript( "1517" );
  	pItem->setColor( packet->shirtColor() );
  	pItem->setNewbie( true );
! 	pChar->addItem( cBaseChar::Shirt, pItem );	
  
  	// Skirt or Pants
! 	pItem = cItem::createFromScript( ( packet->gender() != 0 ) ? "1516" : "152e" );
  	pItem->setColor( packet->pantsColor() );
  	pItem->setNewbie( true );
+ 	pChar->addItem( cBaseChar::Pants, pItem );
  
  	// Hair & Beard
  	if( packet->hairStyle() )
  	{
! 		pItem = cItem::createFromScript( QString( "%1" ).arg( packet->hairStyle(), 0, 16 ) );
  		pItem->setNewbie( true );
  		pItem->setColor( packet->hairColor() );
  		pChar->addItem( cBaseChar::Hair, pItem );
***************
*** 800,807 ****
  	if( packet->beardStyle() )
  	{
! 		pItem = new cItem;
! 		pItem->Init();
! 
! 		pItem->setId( packet->beardStyle() );
  		pItem->setNewbie( true );
  		pItem->setColor( packet->beardColor() );
--- 786,790 ----
  	if( packet->beardStyle() )
  	{
! 		pItem = cItem::createFromScript( QString( "%1" ).arg( packet->beardStyle(), 0, 16 ) );
  		pItem->setNewbie( true );
  		pItem->setColor( packet->beardColor() );
***************
*** 809,815 ****
  	}
  
! 	// Backpack + Bankbox autocreate
! 	pItem = pChar->getBankBox();
! 	pItem = pChar->getBackpack();
  	
  	pChar->setAccount( _account );
--- 792,798 ----
  	}
  
! 	// Automatically create Backpack + Bankbox
! 	pChar->getBankBox();
! 	pChar->getBackpack();
  	
  	pChar->setAccount( _account );