[wpdev-commits] xmlscripts/scripts/system regionchange.py,1.2,1.3

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

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

Modified Files:
	regionchange.py 
Log Message:
More checks for parent/children stuff.


Index: regionchange.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/regionchange.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** regionchange.py	11 Jul 2004 01:34:25 -0000	1.2
--- regionchange.py	11 Jul 2004 01:41:32 -0000	1.3
***************
*** 29,40 ****
  	if not newregion.noentermessage and not oldregion.noentermessage:
  		# Case 0
! 		if newregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion:
  			areaLeaveMessage( socket, oldregion.name )
  			areaEnterMessage( socket, newregion.name )
  		# Case 5
! 		elif oldregion.parent == newregion:
  			areaEnterMessage( socket, newregion.name )
  		# Case 7
! 		elif newregion.parent == oldregion:
  			areaLeaveMessage( socket, oldregion.name )
  	# Cases 1 8 10
--- 29,40 ----
  	if not newregion.noentermessage and not oldregion.noentermessage:
  		# Case 0
! 		if newregion.parent == None or oldregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion:
  			areaLeaveMessage( socket, oldregion.name )
  			areaEnterMessage( socket, newregion.name )
  		# Case 5
! 		elif oldregion.parent == newregion or oldregion.name in newregion.children:
  			areaEnterMessage( socket, newregion.name )
  		# Case 7
! 		elif newregion.parent == oldregion or newregion.name in oldregion.children:
  			areaLeaveMessage( socket, oldregion.name )
  	# Cases 1 8 10
***************
*** 42,52 ****
  	elif newregion.noentermessage and oldregion.noentermessage:
  		# Case 1
! 		if newregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion:
  			pass
  		# Case 8
! 		elif oldregion.parent == newregion:
  			pass
  		# Case 10
! 		elif newregion.parent == oldregion:
  			pass
  	# Cases 2 9 11
--- 42,52 ----
  	elif newregion.noentermessage and oldregion.noentermessage:
  		# Case 1
! 		if newregion.parent == None or oldregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion:
  			pass
  		# Case 8
! 		elif oldregion.parent == newregion or oldregion.name in newregion.children:
  			pass
  		# Case 10
! 		elif newregion.parent == oldregion or newregion.name in oldregion.children:
  			pass
  	# Cases 2 9 11
***************
*** 54,64 ****
  	elif not newregion.noentermessage and oldregion.noentermessage:
  		# Case 2
! 		if newregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion:
  			areaEnterMessage( socket, newregion.name )
  		# Case 9
! 		elif oldregion.parent == newregion:
  			pass
  		# Case 11
! 		elif newregion.parent == oldregion:
  			pass
  	# Cases 3 4 6
--- 54,64 ----
  	elif not newregion.noentermessage and oldregion.noentermessage:
  		# Case 2
! 		if newregion.parent == None or oldregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion:
  			areaEnterMessage( socket, newregion.name )
  		# Case 9
! 		elif oldregion.parent == newregion or oldregion.name in newregion.children:
  			pass
  		# Case 11
! 		elif newregion.parent == oldregion or newregion.name in oldregion.children:
  			pass
  	# Cases 3 4 6
***************
*** 66,76 ****
  	elif not newregion.noentermessage and oldregion.noentermessage:
  		# Case 3
! 		if newregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion:
  			areaLeaveMessage( socket, oldregion.name )
  		# Case 4
! 		elif oldregion.parent == newregion:
  			pass
  		# Case 6
! 		elif newregion.parent == oldregion:
  			pass
  
--- 66,76 ----
  	elif not newregion.noentermessage and oldregion.noentermessage:
  		# Case 3
! 		if newregion.parent == None or oldregion.parent == None or newregion.parent != oldregion or oldregion.parent != newregion:
  			areaLeaveMessage( socket, oldregion.name )
  		# Case 4
! 		elif oldregion.parent == newregion or oldregion.name in newregion.children:
  			pass
  		# Case 6
! 		elif newregion.parent == oldregion or newregion.name in oldregion.children:
  			pass