[wpdev-commits] xmlscripts/scripts/commands where.py,1.3,1.4

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

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

Modified Files:
	where.py 
Log Message:
This looks better in the sysmessage
Also prevents a player's say color from making it hard to read in the journal.


Index: where.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/where.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** where.py	26 May 2004 13:07:21 -0000	1.3
--- where.py	9 Jul 2004 22:45:35 -0000	1.4
***************
*** 17,30 ****
  def where( socket, command, arguments ):
  	char = socket.player
- 	region = char.region
  	pos = char.pos
  	name = None
  
! 	while region:
! 		if region.name and len( region.name ) > 0:
! 			name = region.name
! 			break
! 
! 		region = region.parent
  
  	multi = char.multi
--- 17,26 ----
  def where( socket, command, arguments ):
  	char = socket.player
  	pos = char.pos
+ 	region = wolfpack.region( pos.x, pos.y, pos.map )
  	name = None
  
! 	if region and region.name and len( region.name ) > 0:
! 		name = region.name
  
  	multi = char.multi
***************
*** 48,54 ****
  
  	if name:
! 		char.message( "You are in %s at %d,%d,%d on %s" % ( name, pos.x, pos.y, pos.z, map ) )
  	else:
! 		char.message( "You are at %d,%d,%d on %s" % ( pos.x, pos.y, pos.z, map ) )
  
  def onLoad():
--- 44,50 ----
  
  	if name:
! 		socket.sysmessage( "You are in %s at %d,%d,%d on %s" % ( name, pos.x, pos.y, pos.z, map ) )
  	else:
! 		socket.sysmessage( "You are at %d,%d,%d on %s" % ( pos.x, pos.y, pos.z, map ) )
  
  def onLoad():