[wpdev-commits] xmlscripts/scripts/magic circle4.py,1.7,1.8

[Richard M. <dr...@us...>]

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

Modified Files:
	circle4.py 
Log Message:
Fixes for recalling.


Index: circle4.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle4.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** circle4.py	20 May 2004 06:32:29 -0000	1.7
--- circle4.py	15 Jul 2004 01:17:12 -0000	1.8
***************
*** 139,145 ****
  			return
  
  		region = wolfpack.region(char.pos.x, char.pos.y, char.pos.map)
  
! 		if region.norecallout:
  			char.message(501802)
  			fizzle(char)
--- 139,146 ----
  			return
  
+ 		region = None
  		region = wolfpack.region(char.pos.x, char.pos.y, char.pos.map)
  
! 		if region and region.norecallout:
  			char.message(501802)
  			fizzle(char)
***************
*** 150,153 ****
--- 151,155 ----
  		location = wolfpack.coord(int(location[0]), int(location[1]), int(location[2]), int(location[3]))
  
+ 		region = None
  		region = wolfpack.region(location.x, location.y, location.map)
  
***************
*** 157,161 ****
  			return
  
! 		if region.norecallin:
  			char.message(1019004)
  			fizzle(char)
--- 159,163 ----
  			return
  
! 		if region and region.norecallin:
  			char.message(1019004)
  			fizzle(char)