[Gemrb-commits] gemrb/gemrb/GUIScripts/bg1 GUIWORLD.py,1.2,1.3

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

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

Modified Files:
	GUIWORLD.py 
Log Message:
changed dialog behaviour (now end dialog/continue buttons work if the guiscript supports it)
fixed some bugs regarding viewport shading
improved savegame features (still under development)
other gamescript improvements


Index: GUIWORLD.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg1/GUIWORLD.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GUIWORLD.py	27 May 2005 20:03:53 -0000	1.2
--- GUIWORLD.py	22 Jun 2005 15:55:22 -0000	1.3
***************
*** 43,51 ****
  	if ContinueWindow == None:
  		return
  	GemRB.UnloadWindow (ContinueWindow)
  	GemRB.SetVar ("ActionsWindow", OldActionsWindow)
  	ContinueWindow = None
  	OldActionsWindow = None
! 	GemRB.UnhideGUI ()
  
  
--- 43,56 ----
  	if ContinueWindow == None:
  		return
+ 
+ 	hideflag = GemRB.HideGUI ()
+ 
  	GemRB.UnloadWindow (ContinueWindow)
  	GemRB.SetVar ("ActionsWindow", OldActionsWindow)
+ 	GemRB.SetVar ("DialogChoose", GemRB.GetVar ("DialogOption"))
  	ContinueWindow = None
  	OldActionsWindow = None
! 	if hideflag:
! 		GemRB.UnhideGUI ()
  
  
***************
*** 53,61 ****
  	global ContinueWindow, OldActionsWindow
  
- 	GemRB.HideGUI ()
- 
  	if ContinueWindow:
  		return
  
  	GemRB.LoadWindowPack (GetWindowPack())
  	ContinueWindow = Window = GemRB.LoadWindow (9)
--- 58,66 ----
  	global ContinueWindow, OldActionsWindow
  
  	if ContinueWindow:
  		return
  
+ 	hideflag = GemRB.HideGUI ()
+ 
  	GemRB.LoadWindowPack (GetWindowPack())
  	ContinueWindow = Window = GemRB.LoadWindow (9)
***************
*** 65,82 ****
  	#end dialog
  	Button = GemRB.GetControl (Window, 0)
! 	GemRB.SetText (Window, Button, 9371)
! 	GemRB.SetVarAssoc (Window, Button, "DialogChoose", -1)
  	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseContinueWindow")
! 	
! 	GemRB.UnhideGUI ()
  
  def OpenContinueMessageWindow ():
  	global ContinueWindow, OldActionsWindow
  
- 	GemRB.HideGUI ()
- 
  	if ContinueWindow:
  		return
  
  	GemRB.LoadWindowPack (GetWindowPack())
  	ContinueWindow = Window = GemRB.LoadWindow (9)
--- 70,87 ----
  	#end dialog
  	Button = GemRB.GetControl (Window, 0)
! 	GemRB.SetText (Window, Button, 9371)	
  	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseContinueWindow")
! 	if hideflag:
! 		GemRB.UnhideGUI ()
! 
  
  def OpenContinueMessageWindow ():
  	global ContinueWindow, OldActionsWindow
  
  	if ContinueWindow:
  		return
  
+ 	hideflag = GemRB.HideGUI ()
+ 
  	GemRB.LoadWindowPack (GetWindowPack())
  	ContinueWindow = Window = GemRB.LoadWindow (9)
***************
*** 87,94 ****
  	Button = GemRB.GetControl (Window, 0)
  	GemRB.SetText (Window, Button, 9372)
- 	GemRB.SetVarAssoc (Window, Button, "DialogChoose", 0)
  	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseContinueWindow")
! 	
! 	GemRB.UnhideGUI ()
  
  
--- 92,98 ----
  	Button = GemRB.GetControl (Window, 0)
  	GemRB.SetText (Window, Button, 9372)
  	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseContinueWindow")
! 	if hideflag:
! 		GemRB.UnhideGUI ()
  
  
***************
*** 99,103 ****
  		return
  
! 	GemRB.HideGUI ()
  
  	GemRB.UnloadWindow (ContainerWindow)
--- 103,107 ----
  		return
  
! 	hideflag = GemRB.HideGUI ()
  
  	GemRB.UnloadWindow (ContainerWindow)
***************
*** 115,119 ****
  	GemRB.UnloadTable (Table)
  
! 	GemRB.UnhideGUI ()
  
  
--- 119,124 ----
  	GemRB.UnloadTable (Table)
  
! 	if hideflag:
! 		GemRB.UnhideGUI ()