[wpdev-commits] xmlscripts/scripts/commands add.py,1.11,1.12

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

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

Modified Files:
	add.py 
Log Message:
Fix for the add menu.


Index: add.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/add.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** add.py	21 Sep 2004 08:00:21 -0000	1.11
--- add.py	23 Sep 2004 00:52:46 -0000	1.12
***************
*** 25,31 ****
  		player.socket.sysmessage("You can't add the multi there.")
  		return
! 		
  	multi = wolfpack.addmulti(str(arguments[0]))
! 	
  	# If arguments[1] is true, make the item
  	# static
--- 25,31 ----
  		player.socket.sysmessage("You can't add the multi there.")
  		return
! 
  	multi = wolfpack.addmulti(str(arguments[0]))
! 
  	# If arguments[1] is true, make the item
  	# static
***************
*** 33,37 ****
  		multi.decay = False
  		multi.movable = 3
! 	
  	multi.moveto(target.pos)
  	multi.update()
--- 33,37 ----
  		multi.decay = False
  		multi.movable = 3
! 
  	multi.moveto(target.pos)
  	multi.update()
***************
*** 40,46 ****
  # Target response for adding an item
  #
! def additem(player, arguments, target):		
  	item = wolfpack.additem(str(arguments[0]))
! 	
  	# If arguments[1] is true, make the item
  	# static
--- 40,46 ----
  # Target response for adding an item
  #
! def additem(player, arguments, target):
  	item = wolfpack.additem(str(arguments[0]))
! 
  	# If arguments[1] is true, make the item
  	# static
***************
*** 48,52 ****
  		item.decay = False
  		item.movable = 3
! 	
  	if target.item:
  		if target.item.type == 1:
--- 48,52 ----
  		item.decay = False
  		item.movable = 3
! 
  	if target.item:
  		if target.item.type == 1:
***************
*** 137,141 ****
  	def make(self, player, arguments, nodelay=0):
  		player.socket.sysmessage("Where do you want to place the item '%s'?" % self.definition)
! 		player.socket.attachtarget("commands.add.additem", [self.definition])
  		MakeAction.make(self, player, arguments, nodelay)
  
--- 137,141 ----
  	def make(self, player, arguments, nodelay=0):
  		player.socket.sysmessage("Where do you want to place the item '%s'?" % self.definition)
! 		player.socket.attachtarget("commands.add.additem", [self.definition, False])
  		MakeAction.make(self, player, arguments, nodelay)
  
***************
*** 250,257 ****
  	wolfpack.registercommand('add', add)
  	wolfpack.registercommand('static', static)
! 	
  def onUnload():
!         global generated
!         generated = 0
  
  """
--- 250,257 ----
  	wolfpack.registercommand('add', add)
  	wolfpack.registercommand('static', static)
! 
  def onUnload():
! 	global generated
! 	generated = 0
  
  """