[wpdev-commits] wolfpack items.cpp,1.344,1.345

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

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

Modified Files:
	items.cpp 
Log Message:
Added cliloc support to char.message(). Started moving containers to python.

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.344
retrieving revision 1.345
diff -C2 -d -r1.344 -r1.345
*** items.cpp	30 Aug 2003 17:00:08 -0000	1.344
--- items.cpp	31 Aug 2003 15:23:45 -0000	1.345
***************
*** 631,635 ****
  	// Locked Down Items, NoDecay Items and Items in Containers can never decay
  	// And ofcourse items in multis cannot
! 	if( container() || nodecay() || isLockedDown() || multis() != INVALID_SERIAL )
  		return;
  
--- 631,636 ----
  	// Locked Down Items, NoDecay Items and Items in Containers can never decay
  	// And ofcourse items in multis cannot
! 	// Static/Nevermovable items can't decay too
! 	if( container() || nodecay() || isLockedDown() || multis() != INVALID_SERIAL || magic_ >= 2 )
  		return;
  
***************
*** 2391,2396 ****
  	tile_st tile = TileCache::instance()->getTile( id_ );
  
  	if( tile.weight == 255 && !isAllMovable() )
! 		return;
  
  	cUObject::sendTooltip( mSock );
--- 2392,2402 ----
  	tile_st tile = TileCache::instance()->getTile( id_ );
  
+ 	// If the item is not movable for the client, the item should not have a tooltip
+ 	// Exceptions are noted above and containers
  	if( tile.weight == 255 && !isAllMovable() )
! 	{
! 		if( tile.flag3 & 0x20 == 0 )
! 			return;
! 	}
  
  	cUObject::sendTooltip( mSock );