[Gemrb-commits] gemrb/gemrb/GUIScripts/bg2 GUIMA.py,1.11,1.12

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

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

Modified Files:
	GUIMA.py 
Log Message:
Added AdjustScrolling to the guiscripts
Fixed PST GUIJRNL script warnings


Index: GUIMA.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUIMA.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** GUIMA.py	11 Oct 2004 17:53:20 -0000	1.11
--- GUIMA.py	11 Oct 2004 19:33:40 -0000	1.12
***************
*** 31,34 ****
--- 31,35 ----
  MapWindow = None
  WorldMapWindow = None
+ WorldMapControl = None
  
  ###################################################
***************
*** 96,100 ****
  
  def WorldMapWindowCommon(Travel):
! 	global WorldMapWindow
  
  	GemRB.HideGUI()
--- 97,101 ----
  
  def WorldMapWindowCommon(Travel):
! 	global WorldMapWindow, WorldMapControl
  
  	GemRB.HideGUI()
***************
*** 113,118 ****
  
  	GemRB.CreateWorldMapControl (Window, 4, 0, 62, 640, 418, Travel)
! 	Button = GemRB.GetControl (Window, 4)
! 	
  	# Done
  	Button = GemRB.GetControl (Window, 0)
--- 114,155 ----
  
  	GemRB.CreateWorldMapControl (Window, 4, 0, 62, 640, 418, Travel)
! 	WorldMapControl = GemRB.GetControl (Window, 4)
! 
! 	#north
! 	Button = GemRB.GetControl (Window, 1)
! 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "MapN");
! 
! 	#south
! 	Button = GemRB.GetControl (Window, 2)
! 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "MapS");
! 
! 	#northwest
! 	Button = GemRB.GetControl (Window, 8)
! 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "MapNW");
! 
! 	#northeast
! 	Button = GemRB.GetControl (Window, 9)
! 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "MapNE");
! 
! 	#west
! 	Button = GemRB.GetControl (Window, 10)
! 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "MapW");
! 
! 	#center
! 	Button = GemRB.GetControl (Window, 11)
! 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "MapC");
! 
! 	#east
! 	Button = GemRB.GetControl (Window, 12)
! 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "MapE");
! 
! 	#southwest
! 	Button = GemRB.GetControl (Window, 13)
! 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "MapSW");
! 
! 	#southeast
! 	Button = GemRB.GetControl (Window, 14)
! 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "MapSE");
! 
  	# Done
  	Button = GemRB.GetControl (Window, 0)
***************
*** 122,126 ****
--- 159,198 ----
  		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenMapWindow")
  	GemRB.UnhideGUI ()
+ 	return
+ 
+ def MapN():
+ 	GemRB.AdjustScrolling (WorldMapWindow, WorldMapControl, 0, -10)
+ 	return
+ 
+ def MapNE():
+ 	GemRB.AdjustScrolling (WorldMapWindow, WorldMapControl, 10, -10)
+ 	return
+ 
+ def MapE():
+ 	GemRB.AdjustScrolling (WorldMapWindow, WorldMapControl, 10, 0)
+ 	return
  
+ def MapSE():
+ 	GemRB.AdjustScrolling (WorldMapWindow, WorldMapControl, 10, 10)
+ 	return
+ 
+ def MapS():
+ 	GemRB.AdjustScrolling (WorldMapWindow, WorldMapControl, 0, 10)
+ 	return
+ 
+ def MapSW():
+ 	GemRB.AdjustScrolling (WorldMapWindow, WorldMapControl, -10, 10)
+ 	return
+ 
+ def MapW():
+ 	GemRB.AdjustScrolling (WorldMapWindow, WorldMapControl, -10, 0)
+ 	return
+ 
+ def MapNW():
+ 	GemRB.AdjustScrolling (WorldMapWindow, WorldMapControl, -10, -10)
+ 	return
+ 
+ def MapC():
+ 	return
  
  ###################################################