[wpdev-commits] xmlscripts/scripts/housing deed.py,1.2,1.3

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

Update of /cvsroot/wpdev/xmlscripts/scripts/housing
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9446

Modified Files:
	deed.py 
Log Message:
housing updates

Index: deed.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/housing/deed.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** deed.py	18 Oct 2004 12:05:22 -0000	1.2
--- deed.py	21 Oct 2004 12:08:56 -0000	1.3
***************
*** 71,75 ****
  	
  	player.socket.clilocmessage(1010433)
! 	player.socket.attachmultitarget("housing.deed.placement", dispid - 0x4000, [item.serial], xoffset, yoffset, zoffset)
  	return True
  
--- 71,75 ----
  	
  	player.socket.clilocmessage(1010433)
! 	player.socket.attachmultitarget("housing.deed.placement", dispid - 0x4000, [item.serial, dispid, xoffset, yoffset, zoffset], xoffset, yoffset, zoffset)
  	return True
  
***************
*** 79,84 ****
  def placement(player, arguments, target):
  	deed = wolfpack.finditem(arguments[0])
  	if not checkDeed(player, deed):
! 		return
  
  	if not player.canreach(target.pos, 20):
--- 79,86 ----
  def placement(player, arguments, target):
  	deed = wolfpack.finditem(arguments[0])
+ 	(dispid, xoffset, yoffset, zoffset) = arguments[1:] # Get the rest of the arguments
+ 	
  	if not checkDeed(player, deed):
! 		return	
  
  	if not player.canreach(target.pos, 20):
***************
*** 86,94 ****
  		return
  		
  	house = wolfpack.addmulti(str(deed.gettag('section')))
  	house.owner = player
  	house.moveto(target.pos)
  	house.update()
- 	
  	housing.registerHouse(house)
  
--- 88,107 ----
  		return
  		
+ 	(canplace, moveout) = wolfpack.canplace(target.pos, dispid - 0x4000, 4)
+ 	
+ 	if not canplace:
+ 		player.socket.sysmessage('CANT PLACE THERE')
+ 		return
+ 	
  	house = wolfpack.addmulti(str(deed.gettag('section')))
  	house.owner = player
  	house.moveto(target.pos)
  	house.update()
  	housing.registerHouse(house)
  
+ 	for obj in moveout:
+ 		obj.removefromview()
+ 		obj.moveto(player.pos)
+ 		obj.update()
+ 		if obj.ischar() and obj.socket:
+ 			obj.socket.resendworld()