[wpdev-commits] xmlscripts/scripts/magic circle3.py,1.12,1.13

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

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

Modified Files:
	circle3.py 
Log Message:
Fix for bug #0000268

Index: circle3.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle3.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** circle3.py	29 Aug 2004 18:30:49 -0000	1.12
--- circle3.py	3 Sep 2004 16:56:23 -0000	1.13
***************
*** 84,97 ****
  		char.turnto(target)
  
! 		# Line of Sight (touch!! or else we can teleport trough windows)
! 		if not char.canreach(target, 12):
  			if char.socket:
! 				char.socket.clilocmessage(500237)
  			return
  
! 		# Check if the target tile is blocked or in a multi
! 		if (not target.validspawnspot() or wolfpack.findmulti(target)) and not char.gm:
  			if char.socket:
! 				char.socketclilocmessage(501942)
  			return
  
--- 84,99 ----
  		char.turnto(target)
  
! 		# Check if the target tile is blocked or in a multi
! 		# target.validspawnspot() will automatically set the z
! 		# of the coord to the nearest top
! 		if (not target.validspawnspot() or wolfpack.findmulti(target)) and not char.gm:		
  			if char.socket:
! 				char.socketclilocmessage(501942)
  			return
  
! 		# Line of Sight (touch!! or else we can teleport trough windows)
! 		if not char.canreach(target, 12):
  			if char.socket:
! 				char.socket.clilocmessage(500237)
  			return