[Gemrb-commits] gemrb: branch master updated. 909b234c686b6a56133c53237e1080220a37b19a

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  909b234c686b6a56133c53237e1080220a37b19a (commit)

Summary of changes:
 gemrb/GUIScripts/bg1/GUICG12.py |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)
      from  63f48b4ec1f2ce5317b98bafa350ad014ce93779 (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=909b234c686b6a56133c53237e1080220a37b19a

commit 909b234c686b6a56133c53237e1080220a37b19a
Author: Avenger <ave...@so...>
Date:   Fri Jul 2 18:43:04 2010 +0200

    probably fixed returning from custom portraits (CG needs to be synced up with bg2)

diff --git a/gemrb/GUIScripts/bg1/GUICG12.py b/gemrb/GUIScripts/bg1/GUICG12.py
index e0a055f..adc98f4 100644
--- a/gemrb/GUIScripts/bg1/GUICG12.py
+++ b/gemrb/GUIScripts/bg1/GUICG12.py
@@ -43,8 +43,8 @@ def OnLoad():
 	global Gender
 
 	if GUICommon.CloseOtherWindow (OnLoad):
-		if(AppearanceWindow):AppearanceWindow.Unload()
-		AppearanceWindow = None
+		if(AppearanceWindow):
+			AppearanceWindow.Unload()
 		return
 
 	GemRB.LoadWindowPack("GUICG")
@@ -123,20 +123,21 @@ def LeftPress():
 			return
 
 def CustomDone():
-	Window = CustomWindow
+	global AppearanceWindow
 
+	Window = CustomWindow
 	Portrait = PortraitList1.QueryText ()
 	GemRB.SetToken ("LargePortrait", Portrait)
 	Portrait = PortraitList2.QueryText ()
 	GemRB.SetToken ("SmallPortrait", Portrait)
 	if Window:
 		Window.Unload ()
-	if AppearanceWindow:
-		AppearanceWindow.Unload ()
 	CharGenCommon.next()
 	return
 
 def CustomAbort():
+	global CustomWindow
+
 	if CustomWindow:
 		CustomWindow.Unload ()
 	return
@@ -237,10 +238,3 @@ def NextPress():
 	#GemRB.SetNextScript("CharGen")
 	#GemRB.SetNextScript ("CharGen2") #Before race
 	#return
-
-#def BackPress():
-#	if AppearanceWindow:
-#		AppearanceWindow.Unload ()
-#	GemRB.SetNextScript ("GUICG1")
-	#GemRB.SetVar ("Gender",0) #scrapping the gender value
-#	return

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


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