[wpdev-commits] xmlscripts/scripts trashcan.py,1.1,1.2 wool.py,1.10,1.11

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

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

Modified Files:
	trashcan.py wool.py 
Log Message:
Crash Fixes

Index: trashcan.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/trashcan.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** trashcan.py	17 Jul 2004 07:23:59 -0000	1.1
--- trashcan.py	13 Oct 2004 19:41:02 -0000	1.2
***************
*** 10,14 ****
  	if target.baseid == 'trashcan':
  		target.settag( 'trash_timer', int( wolfpack.time.currenttime() + delete_time ) )
! 		wolfpack.addtimer( delete_time, "trashcan.timerPass", [ target ] )
  		return False
  	else:
--- 10,14 ----
  	if target.baseid == 'trashcan':
  		target.settag( 'trash_timer', int( wolfpack.time.currenttime() + delete_time ) )
! 		wolfpack.addtimer( delete_time, "trashcan.timerPass", [ target.serial ] )
  		return False
  	else:
***************
*** 17,21 ****
  
  def timerPass( timer, args ):
! 	trashcan = args[0]
  	if trashcan.baseid != "trashcan":
  		return False
--- 17,21 ----
  
  def timerPass( timer, args ):
! 	trashcan = wolfpack.finditem(args[0])
  	if trashcan.baseid != "trashcan":
  		return False
***************
*** 40,43 ****
  		return False
  	item.settag( 'trash_timer', int( wolfpack.time.currenttime() + delete_time ) )
! 	wolfpack.addtimer( delete_time, "trashcan.timerPass", [ item ] )
  	return False
--- 40,43 ----
  		return False
  	item.settag( 'trash_timer', int( wolfpack.time.currenttime() + delete_time ) )
! 	wolfpack.addtimer( delete_time, "trashcan.timerPass", [ item.serial ] )
  	return False

Index: wool.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wool.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** wool.py	2 Sep 2004 00:44:27 -0000	1.10
--- wool.py	13 Oct 2004 19:41:02 -0000	1.11
***************
*** 70,74 ****
  		wheel = wolfpack.finditem( target.item.serial )
  		processtime = 5000 # 5 Seconds
! 		char.addtimer( processtime, "wool.ProcessTimer", [wheel, color] )
  
  	elif target.item.id in animids:
--- 70,74 ----
  		wheel = wolfpack.finditem( target.item.serial )
  		processtime = 5000 # 5 Seconds
! 		char.addtimer( processtime, "wool.ProcessTimer", [wheel.serial, color] )
  
  	elif target.item.id in animids:
***************
*** 83,87 ****
  
  def ProcessTimer( char, args ):
! 	wheel = args[0]
  	color = args[1]
  	GetYarn( char, wheel, color )
--- 83,87 ----
  
  def ProcessTimer( char, args ):
! 	wheel = wolfpack.finditem(args[0])
  	color = args[1]
  	GetYarn( char, wheel, color )