[wpdev-commits] wolfpack corpse.cpp,1.36,1.37 items.cpp,1.351,1.352 npc.cpp,1.44,1.45 player.cpp,1.40,1.41

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

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

Modified Files:
	corpse.cpp items.cpp npc.cpp player.cpp 
Log Message:
Fixed some tooltip bugs. 

Index: corpse.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/corpse.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** corpse.cpp	13 Sep 2003 13:27:26 -0000	1.36
--- corpse.cpp	14 Sep 2003 16:31:48 -0000	1.37
***************
*** 202,208 ****
  				// Send corpse clothing
  				// Send content
  				mSock->send( &sendItem );
  				mSock->send( &corpseEquip );
! 				mSock->send( &corpseContent );
  			}
  		}
--- 202,209 ----
  				// Send corpse clothing
  				// Send content
+ 				sendTooltip( mSock );
  				mSock->send( &sendItem );
  				mSock->send( &corpseEquip );
! 				mSock->send( &corpseContent );				
  			}
  		}

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.351
retrieving revision 1.352
diff -C2 -d -r1.351 -r1.352
*** items.cpp	12 Sep 2003 15:39:55 -0000	1.351
--- items.cpp	14 Sep 2003 16:31:48 -0000	1.352
***************
*** 2376,2379 ****
--- 2376,2380 ----
  		( id >= 0xed4 && id <= 0xede ) ||	// Graves and Guildstones
  		( id >= 0x1165 && id <= 0x1184 ) ||	// More Gravestones
+ 		( id == 0x2006 ) ||
  		!name_.isNull()						// Non Default Name
  		)

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** npc.cpp	11 Sep 2003 15:33:58 -0000	1.44
--- npc.cpp	14 Sep 2003 16:31:48 -0000	1.45
***************
*** 635,638 ****
--- 635,640 ----
  	}	
  
+ 	corpse->update();
+ 
  	cUOTxDeathAction dAction;
  	dAction.setSerial( serial() );
***************
*** 648,655 ****
  			mSock->send( &rObject );
  		}
- 	
- 	corpse->update();
- 
- 	resend( true );
  
  	// trigger the event
--- 650,653 ----

Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** player.cpp	14 Sep 2003 16:09:01 -0000	1.40
--- player.cpp	14 Sep 2003 16:31:48 -0000	1.41
***************
*** 635,639 ****
  			//	pi_j->setLayer( 0x1A );
  		}
! 	}	
  
  	cUOTxDeathAction dAction;
--- 635,641 ----
  			//	pi_j->setLayer( 0x1A );
  		}
! 	}
! 
! 	corpse->update();
  
  	cUOTxDeathAction dAction;
***************
*** 650,657 ****
  			mSock->send( &rObject );
  		}
- 	
- 	corpse->update();
  
! #pragma message( "Deathshroud has to be defined as 204e in the scripts" )
  	P_ITEM pItem = cItem::createFromScript( "204e" );
  	if( pItem )
--- 652,658 ----
  			mSock->send( &rObject );
  		}
  
! 	resend( false );
! 
  	P_ITEM pItem = cItem::createFromScript( "204e" );
  	if( pItem )
***************
*** 661,666 ****
  	}
  
- 	resend( true );
- 
  	if( socket_ )
  	{
--- 662,665 ----
***************
*** 668,671 ****
--- 667,671 ----
  		socket_->send( &cDeath );
  	}
+ 
  	// trigger the event now
  	onDeath();