[Gemrb-commits] gemrb/gemrb/GUIScripts/pst GUIMA.py,1.17,1.18

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

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

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/pst/GUIMA.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** GUIMA.py	22 Nov 2004 18:55:42 -0000	1.17
--- GUIMA.py	25 Feb 2005 15:12:20 -0000	1.18
***************
*** 39,43 ****
  	if CloseOtherWindow (OpenMapWindow):
  		GemRB.HideGUI ()
! 		if WorldMapWindow: OpenWorldMapWindow ()
  		
  		GemRB.UnloadWindow (MapWindow)
--- 39,43 ----
  	if CloseOtherWindow (OpenMapWindow):
  		GemRB.HideGUI ()
! 		if WorldMapWindow: OpenWorldMapWindowInside ()
  		
  		GemRB.UnloadWindow (MapWindow)
***************
*** 113,122 ****
  	return
  
! ###################################################
! # End of file GUIMA.py
  def OpenWorldMapWindow ():
! 	global WorldMapWindow, Travel
  
- 	Travel = 1 #allow travel or not, this should be set somehow
  	GemRB.HideGUI()
  
--- 113,127 ----
  	return
  
! def OpenWorldMapWindowInside ():
!         WorldMapWindowCommon (-1)
!         return
! 
  def OpenWorldMapWindow ():
!         WorldMapWindowCommon (GemRB.GetVar ("Travel"))
!         return
! 
! def WorldMapWindowCommon (Travel):
! 	global WorldMapWindow
  
  	GemRB.HideGUI()
  
***************
*** 124,129 ****
  		GemRB.UnloadWindow (WorldMapWindow)
  		WorldMapWindow = None
! 		GemRB.SetVar ("OtherWindow", MapWindow)
! 
  		GemRB.UnhideGUI ()
  		return
--- 129,133 ----
  		GemRB.UnloadWindow (WorldMapWindow)
  		WorldMapWindow = None
! 		GemRB.SetVar ("OtherWindow", -1)
  		GemRB.UnhideGUI ()
  		return
***************
*** 131,146 ****
  	GemRB.LoadWindowPack ("GUIWMAP")
  	WorldMapWindow = Window = GemRB.LoadWindow (0)
  	GemRB.SetVar ("OtherWindow", WorldMapWindow)
  
- 	#Button = GemRB.GetControl (Window, 4)
- 	#GemRB.SetControlSize (Window, Button, 0, 0)
  	GemRB.CreateWorldMapControl (Window, 4, 0, 62, 640, 418, Travel)
! 	Map = GemRB.GetControl (Window, 4)
  	
  	# Done
  	Button = GemRB.GetControl (Window, 0)
  	GemRB.SetText (Window, Button, 1403)
! 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenWorldMapWindow")
! 
  	GemRB.UnhideGUI ()
  
--- 135,154 ----
  	GemRB.LoadWindowPack ("GUIWMAP")
  	WorldMapWindow = Window = GemRB.LoadWindow (0)
+ 	MapWindow = None
  	GemRB.SetVar ("OtherWindow", WorldMapWindow)
  
  	GemRB.CreateWorldMapControl (Window, 4, 0, 62, 640, 418, Travel)
! 	GemRB.GetControl (Window, 4)
  	
  	# Done
  	Button = GemRB.GetControl (Window, 0)
  	GemRB.SetText (Window, Button, 1403)
! 	if Travel>=0:
! 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenWorldMapWindow")
! 	else:
! 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenMapWindow")
  	GemRB.UnhideGUI ()
  
+ ###################################################
+ # End of file GUIMA.py
+