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

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

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

Modified Files:
	circle3.py 
Log Message:
fix for basescripts issues

Index: circle3.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle3.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** circle3.py	29 Aug 2004 17:53:43 -0000	1.11
--- circle3.py	29 Aug 2004 18:30:49 -0000	1.12
***************
*** 184,192 ****
  		# Check if there is an event handling onUse but not onTelekinesis
  		for event in target.scripts:
! 			if wolfpack.hasscript(event, EVENT_TELEKINESIS):
  				hasevent = 1 # The object has at least one telekinesis handler
  				continue
  
! 			if wolfpack.hasscript(event, EVENT_USE):
  				if char.socket:
  					char.socket.clilocmessage(501857)
--- 184,192 ----
  		# Check if there is an event handling onUse but not onTelekinesis
  		for event in target.scripts:
! 			if wolfpack.hasevent(event, EVENT_TELEKINESIS):
  				hasevent = 1 # The object has at least one telekinesis handler
  				continue
  
! 			if wolfpack.hasevent(event, EVENT_USE):
  				if char.socket:
  					char.socket.clilocmessage(501857)
***************
*** 208,212 ****
  		for event in target.scripts:
  			# If the event can handle onTelekinesis, call it
! 			if wolfpack.hasscript(event, EVENT_TELEKINESIS):
  				if wolfpack.callevent(event, EVENT_TELEKINESIS, (char, target)):
  					return
--- 208,212 ----
  		for event in target.scripts:
  			# If the event can handle onTelekinesis, call it
! 			if wolfpack.hasevent(event, EVENT_TELEKINESIS):
  				if wolfpack.callevent(event, EVENT_TELEKINESIS, (char, target)):
  					return