From: Jaka K. <lyn...@us...> - 2010-11-28 20:36:02
|
gemrb: Infinity Engine emulator The branch master has been updated via 7aee8c9805dc234a112d593494b27443b2e62bf7 (commit) Summary of changes: gemrb/GUIScripts/bg2/CharGenCommon.py | 2 +- gemrb/GUIScripts/bg2/GUICG12.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) from 6b58939be750f18c7d32a9837401bd6b6f72ea7d (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=7aee8c9805dc234a112d593494b27443b2e62bf7 commit 7aee8c9805dc234a112d593494b27443b2e62bf7 Author: Jaka Kranjc <lyn...@us...> Date: Sun Nov 28 21:36:18 2010 +0100 ammened previous commit: also check the selected portrait diff --git a/gemrb/GUIScripts/bg2/CharGenCommon.py b/gemrb/GUIScripts/bg2/CharGenCommon.py index 85431f7..dbf1d3b 100644 --- a/gemrb/GUIScripts/bg2/CharGenCommon.py +++ b/gemrb/GUIScripts/bg2/CharGenCommon.py @@ -45,7 +45,7 @@ def DisplayOverview(step): PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET) PortraitName = GemRB.GetToken ("LargePortrait") if PortraitName != "": - if GemRB.HasResource ("NOPORTMD", RES_BMP, 1): + if GemRB.HasResource (PortraitName, RES_BMP, 1) or GemRB.HasResource ("NOPORTMD", RES_BMP, 1): PortraitButton.SetPicture (PortraitName, "NOPORTMD") PortraitButton.SetState (IE_GUI_BUTTON_LOCKED) diff --git a/gemrb/GUIScripts/bg2/GUICG12.py b/gemrb/GUIScripts/bg2/GUICG12.py index 28ad2cd..0929348 100644 --- a/gemrb/GUIScripts/bg2/GUICG12.py +++ b/gemrb/GUIScripts/bg2/GUICG12.py @@ -218,7 +218,7 @@ def CustomPress(): Button = Window.GetControl (0) PortraitName = PortraitsTable.GetRowName (LastPortrait)+"M" - if GemRB.HasResource ("NOPORTMD", RES_BMP, 1): + if GemRB.HasResource (PortraitName, RES_BMP, 1) or GemRB.HasResource ("NOPORTMD", RES_BMP, 1): Button.SetPicture (PortraitName, "NOPORTMD") Button.SetState (IE_GUI_BUTTON_LOCKED) ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |