[Gemrb-commits] gemrb: branch master updated. v0.6.2-698-ga153d8d

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  a153d8dcca9a53feb9849084ba9e987719a925c7 (commit)

Summary of changes:
 gemrb/GUIScripts/CommonWindow.py |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)
      from  e1ee7121003a95a5562f2d94e32b0bd8a74c29b8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=a153d8dcca9a53feb9849084ba9e987719a925c7

commit a153d8dcca9a53feb9849084ba9e987719a925c7
Author: Avenger <ave...@so...>
Date:   Fri Feb 4 19:00:29 2011 +0100

    fixed container window vs. other windows

diff --git a/gemrb/GUIScripts/CommonWindow.py b/gemrb/GUIScripts/CommonWindow.py
index 02ea1e6..196008c 100644
--- a/gemrb/GUIScripts/CommonWindow.py
+++ b/gemrb/GUIScripts/CommonWindow.py
@@ -163,18 +163,20 @@ def OpenContainerWindow ():
 	GemRB.LoadWindowPack (GUICommon.GetWindowPack())
 	ContainerWindow = Window = GemRB.LoadWindow (8)
 
+
+	#stop gears from interfering
 	if GUICommon.GameIsPST():
+		GUIWORLD.OldPortraitWindow = GUIClasses.GWindow( GemRB.GetVar ("PortraitWindow") )
 		GUICommonWindows.DisableAnimatedWindows ()
+
+	if GUICommon.GameIsIWD2():
+		GUIWORLD.OldMessageWindow = GUIClasses.GWindow( GemRB.GetVar ("MessageWindow") )
+		GemRB.SetVar ("MessageWindow", Window.ID)
 	else:
-		# FIXME: see note in CloseContainerWindow
-		if GUICommon.GameIsIWD2():
-			GUIWORLD.OldMessageWindow = GUIClasses.GWindow( GemRB.GetVar ("MessageWindow") )
-			GemRB.SetVar ("MessageWindow", Window.ID)
-		else:
-			GUIWORLD.OldActionsWindow = GUIClasses.GWindow( GemRB.GetVar ("ActionsWindow") )
-			GUIWORLD.OldMessageWindow = GUIClasses.GWindow( GemRB.GetVar ("MessageWindow") )
-			GemRB.SetVar ("MessageWindow", -1)
-			GemRB.SetVar ("ActionsWindow", Window.ID)
+		GUIWORLD.OldActionsWindow = GUIClasses.GWindow( GemRB.GetVar ("ActionsWindow") )
+		GUIWORLD.OldMessageWindow = GUIClasses.GWindow( GemRB.GetVar ("MessageWindow") )
+		GemRB.SetVar ("MessageWindow", -1)
+		GemRB.SetVar ("ActionsWindow", Window.ID)
 
 	Container = GemRB.GetContainer(0)
 
@@ -274,9 +276,7 @@ def CloseContainerWindow ():
 
 	if GUICommon.GameIsPST():
 		GUICommonWindows.EnableAnimatedWindows ()
-		if hideflag:
-			GemRB.UnhideGUI ()
-		return
+		GemRB.SetVar ("PortraitWindow", GUIWORLD.OldPortraitWindow.ID)
 
 	# FIXME: iwd2 bug or just bad naming?
 	if GUICommon.GameIsIWD2():
@@ -284,6 +284,7 @@ def CloseContainerWindow ():
 	else:
 		GemRB.SetVar ("ActionsWindow", GUIWORLD.OldActionsWindow.ID)
 		GemRB.SetVar ("MessageWindow", GUIWORLD.OldMessageWindow.ID)
+
 	Table = GemRB.LoadTable ("containr")
 	row = Container['Type']
 	tmp = Table.GetValue (row, 2)

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator