Update of /cvsroot/wpdev/xmlscripts/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16207/scripts
Modified Files:
equipment.py
Log Message:
Fixed equipment items not equipping on dclick.
Index: equipment.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** equipment.py 25 Aug 2004 17:03:05 -0000 1.28
--- equipment.py 26 Aug 2004 01:21:22 -0000 1.29
***************
*** 370,378 ****
# in the eventchain somewhere. if not,
# return 1 to handle the equip event.
! events = item.scripts
! for event in events:
! if wolfpack.hasscript(event, EVENT_WEARITEM):
! result = wolfpack.callevent(event, EVENT_WEARITEM, (player, player, item, layer))
if result:
return 1
--- 370,378 ----
# in the eventchain somewhere. if not,
# return 1 to handle the equip event.
! scripts = item.scripts
! for script in scripts:
! if wolfpack.hasevent(script, EVENT_WEARITEM):
! result = wolfpack.callevent(script, EVENT_WEARITEM, (player, player, item, layer))
if result:
return 1
***************
*** 382,387 ****
item.soundeffect(0x57)
! for event in events[events.index("equipment")+1:]:
! if wolfpack.hasscript(event, EVENT_USE):
return 0
--- 382,387 ----
item.soundeffect(0x57)
! for script in scripts[scripts.index("equipment")+1:]:
! if wolfpack.hasevent(script, EVENT_USE):
return 0
|