Update of /cvsroot/wpdev/xmlscripts/scripts/commands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3040/scripts/commands
Modified Files:
info.py
Log Message:
if color/amount was changed, it wasn't updated on "OK"
Index: info.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/info.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** info.py 10 Sep 2004 20:20:43 -0000 1.20
--- info.py 14 Sep 2004 14:24:02 -0000 1.21
***************
*** 31,38 ****
#if len(argstring) > 0:
# TODO: implement spawnregion info gump and more here
! #return 1
socket.attachtarget( "commands.info.infotargetresponse" )
! return 1
def onLoad():
--- 31,38 ----
#if len(argstring) > 0:
# TODO: implement spawnregion info gump and more here
! #return True
socket.attachtarget( "commands.info.infotargetresponse" )
! return True
def onLoad():
***************
*** 41,63 ****
def infotargetresponse( char, args, target ):
if not char.socket:
! return 0
# map target
if target.char:
charinfo( char.socket, target.char )
! return 1
elif target.item:
iteminfo( char.socket, target.item )
! return 1
elif target.model == 0:
map = wolfpack.map( target.pos.x, target.pos.y, target.pos.map )
tile = wolfpack.landdata( map['id'] )
maptileinfo( char.socket, map, tile )
! return 1
elif target.model != 0:
tile = wolfpack.tiledata( target.model )
statictileinfo( char.socket, target.model, target.pos, tile )
! return 1
! return 1
def maptileinfo( socket, map, tile ):
--- 41,63 ----
def infotargetresponse( char, args, target ):
if not char.socket:
! return False
# map target
if target.char:
charinfo( char.socket, target.char )
! return True
elif target.item:
iteminfo( char.socket, target.item )
! return True
elif target.model == 0:
map = wolfpack.map( target.pos.x, target.pos.y, target.pos.map )
tile = wolfpack.landdata( map['id'] )
maptileinfo( char.socket, map, tile )
! return True
elif target.model != 0:
tile = wolfpack.tiledata( target.model )
statictileinfo( char.socket, target.model, target.pos, tile )
! return True
! return True
def maptileinfo( socket, map, tile ):
***************
*** 539,548 ****
char = args[0]
if choice.button == 0 or not char or not socket:
! return 1
# check for rank
#if char.rank >= player.rank and not player == char:
# socket.sysmessage( "You've burnt your fingers!" )
! # return 1
textentries = choice.text
--- 539,548 ----
char = args[0]
if choice.button == 0 or not char or not socket:
! return True
# check for rank
#if char.rank >= player.rank and not player == char:
# socket.sysmessage( "You've burnt your fingers!" )
! # return True
textentries = choice.text
***************
*** 750,758 ****
char.update()
! return 1
def iteminfo( socket, item ):
if not socket or not item:
! return 0
gump = wolfpack.gumps.cGump()
--- 750,758 ----
char.update()
! return True
def iteminfo( socket, item ):
if not socket or not item:
! return False
gump = wolfpack.gumps.cGump()
***************
*** 1066,1070 ****
item = args[0]
if choice.button == 0 or not item or not socket:
! return 1
textentries = choice.text
--- 1066,1070 ----
item = args[0]
if choice.button == 0 or not item or not socket:
! return True
textentries = choice.text
***************
*** 1261,1265 ****
if choice.button == 1:
iteminfo( socket, item )
! item.update()
!
! return 1
--- 1261,1265 ----
if choice.button == 1:
iteminfo( socket, item )
!
! item.update()
! return True
|
