[Gemrb-commits] gemrb: branch master updated. 59b107072f9dfa2b19da80bd1cd306bf21c5a7e0

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  59b107072f9dfa2b19da80bd1cd306bf21c5a7e0 (commit)

Summary of changes:
 gemrb/GUIScripts/bg1/GUIPR.py |    5 +++--
 gemrb/GUIScripts/bg2/GUIPR.py |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)
      from  0e1b0767590da370d6f9642f038df4e4b115159b (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=59b107072f9dfa2b19da80bd1cd306bf21c5a7e0

commit 59b107072f9dfa2b19da80bd1cd306bf21c5a7e0
Author: Jaka Kranjc <lyn...@us...>
Date:   Sat Jul 31 19:26:07 2010 +0200

    gray out the priest spellbook if the pc can't cast

diff --git a/gemrb/GUIScripts/bg1/GUIPR.py b/gemrb/GUIScripts/bg1/GUIPR.py
index fc24ea5..066f1a3 100644
--- a/gemrb/GUIScripts/bg1/GUIPR.py
+++ b/gemrb/GUIScripts/bg1/GUIPR.py
@@ -28,6 +28,7 @@ import CommonTables
 import GUICommonWindows
 from GUIDefines import *
 from ie_stats import *
+from ie_action import ACT_CAST
 
 PriestWindow = None
 PriestSpellInfoWindow = None
@@ -176,12 +177,12 @@ def UpdatePriestWindow ():
 			Button.SetTooltip ('')
 			Button.EnableBorder (0, 0)
 
-	Class = GemRB.GetPlayerStat (GemRB.GameGetSelectedPCSingle(), IE_CLASS)
+	Class = GemRB.GetPlayerStat (pc, IE_CLASS)
 	DivineCaster = CommonTables.ClassSkills.GetValue (Class, 1)
 	if DivineCaster == "*":
 		# also check the DRUIDSPELL column
 		DivineCaster = CommonTables.ClassSkills.GetValue (Class, 0)
-	if DivineCaster == "*":
+	if DivineCaster == "*" or GemRB.GetPlayerStat(pc, IE_DISABLEDBUTTON)&(1<<ACT_CAST):
 		Window.SetVisible (WINDOW_GRAYED)
 	else:
 		Window.SetVisible (WINDOW_VISIBLE)
diff --git a/gemrb/GUIScripts/bg2/GUIPR.py b/gemrb/GUIScripts/bg2/GUIPR.py
index 39aad69..604fa11 100644
--- a/gemrb/GUIScripts/bg2/GUIPR.py
+++ b/gemrb/GUIScripts/bg2/GUIPR.py
@@ -27,6 +27,7 @@ from GUIDefines import *
 from ie_stats import *
 import GUICommon
 import CommonTables
+from ie_action import ACT_CAST
 
 PriestWindow = None
 PriestSpellInfoWindow = None
@@ -184,12 +185,12 @@ def UpdatePriestWindow ():
 			Button.SetTooltip ('')
 			Button.EnableBorder (0, 0)
 
-	Class = GemRB.GetPlayerStat (GemRB.GameGetSelectedPCSingle(), IE_CLASS)
+	Class = GemRB.GetPlayerStat (pc, IE_CLASS)
 	DivineCaster = CommonTables.ClassSkills.GetValue (Class, 1)
 	if DivineCaster == "*":
 		# also check the DRUIDSPELL column
 		DivineCaster = CommonTables.ClassSkills.GetValue (Class, 0)
-	if DivineCaster == "*":
+	if DivineCaster == "*" or GemRB.GetPlayerStat(pc, IE_DISABLEDBUTTON)&(1<<ACT_CAST):
 		Window.SetVisible (WINDOW_GRAYED)
 	else:
 		Window.SetVisible (WINDOW_VISIBLE)

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


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