[Gemrb-commits] gemrb/gemrb/GUIScripts/bg2 GUIMA.py,1.19,1.20

[Laszlo T. <ave...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4319/GUIScripts/bg2

Modified Files:
	GUIMA.py 
Log Message:
made some fixes in the worldmap (calculating distances, exit direction)
and fixed a crasher if setviewport gets negative width or height


Index: GUIMA.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUIMA.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** GUIMA.py	4 Dec 2004 17:35:09 -0000	1.19
--- GUIMA.py	25 Feb 2005 15:12:17 -0000	1.20
***************
*** 83,88 ****
  
  def RemoveMapNote ():
! 	PosX = GemRB.GetVar("MapControlX")
! 	PosY = GemRB.GetVar("MapControlY")
  	GemRB.SetMapnote (PosX, PosY, 0, "")
  	CloseNoteWindow ()
--- 83,88 ----
  
  def RemoveMapNote ():
! 	PosX = GemRB.GetVar ("MapControlX")
! 	PosY = GemRB.GetVar ("MapControlY")
  	GemRB.SetMapnote (PosX, PosY, 0, "")
  	CloseNoteWindow ()
***************
*** 90,98 ****
  
  def SetMapNote ():
! 	PosX = GemRB.GetVar("MapControlX")
! 	PosY = GemRB.GetVar("MapControlY")
  	Label = GemRB.GetControl (NoteWindow, 1)
  	Text = GemRB.QueryText (NoteWindow, Label)
! 	Color = GemRB.GetVar("Color")
  	GemRB.SetMapnote (PosX, PosY, Color, Text)
  	CloseNoteWindow ()
--- 90,98 ----
  
  def SetMapNote ():
! 	PosX = GemRB.GetVar ("MapControlX")
! 	PosY = GemRB.GetVar ("MapControlY")
  	Label = GemRB.GetControl (NoteWindow, 1)
  	Text = GemRB.QueryText (NoteWindow, Label)
! 	Color = GemRB.GetVar ("Color")
  	GemRB.SetMapnote (PosX, PosY, Color, Text)
  	CloseNoteWindow ()
***************
*** 136,144 ****
  
  def OpenWorldMapWindowInside ():
! 	WorldMapWindowCommon(0)
  	return
  
  def OpenWorldMapWindow ():
! 	WorldMapWindowCommon(1)
  	return
  
--- 136,144 ----
  
  def OpenWorldMapWindowInside ():
! 	WorldMapWindowCommon (-1)
  	return
  
  def OpenWorldMapWindow ():
! 	WorldMapWindowCommon (GemRB.GetVar ("Travel"))
  	return
  
***************
*** 201,205 ****
  	# Done
  	Button = GemRB.GetControl (Window, 0)
! 	if Travel:
  		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenWorldMapWindow")
  	else:
--- 201,205 ----
  	# Done
  	Button = GemRB.GetControl (Window, 0)
! 	if Travel>=0:
  		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenWorldMapWindow")
  	else: