From: Laszlo T. <ave...@us...> - 2012-03-05 18:46:31
|
gemrb: Infinity Engine emulator The branch master has been updated via ba49c298558aa89761d0d452b0c41258e031b36b (commit) Summary of changes: gemrb/GUIScripts/GUICommonWindows.py | 7 ++++--- gemrb/plugins/GUIScript/GUIScript.cpp | 9 +++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) from f2e1b99313ddd7e67164d358d80f66e6ec2fb039 (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=ba49c298558aa89761d0d452b0c41258e031b36b commit ba49c298558aa89761d0d452b0c41258e031b36b Author: Avenger <ave...@so...> Date: Mon Mar 5 19:45:32 2012 +0100 skill menu is now more like original diff --git a/gemrb/GUIScripts/GUICommonWindows.py b/gemrb/GUIScripts/GUICommonWindows.py index d1e7eb7..dd5890a 100644 --- a/gemrb/GUIScripts/GUICommonWindows.py +++ b/gemrb/GUIScripts/GUICommonWindows.py @@ -423,10 +423,11 @@ def SetupBookSelection (): Button.SetActionIcon (globals(), 50+i) return -skillbar=(ACT_SEARCH, ACT_STEALTH, ACT_THIEVING, ACT_BARDSONG, ACT_TAMING, ACT_WILDERNESS, ACT_TURN, 100, 100, 100, 100, 100) +#you can change this for custom skills, this is the original engine +skillbar=(ACT_STEALTH, ACT_SEARCH, ACT_THIEVING, ACT_WILDERNESS, ACT_TAMING, 100, 100, 100, 100, 100, 100, 100) def SetupSkillSelection (): - pc = GemRB.GameGetSelectedPCSingle () + pc = GemRB.GameGetFirstSelectedActor () CurrentWindow.SetupControls( globals(), pc, ActionBarControlOffset, skillbar) return @@ -513,7 +514,7 @@ def UpdateActionsWindow (): GemRB.SetVar ("Type", 511) Spellbook.SetupSpellIcons(CurrentWindow, 511, TopIndex, ActionBarControlOffset) elif level == 8: # shapes selection - GemRB.SetVar ("Type", 1024) + GemRB.SetVar ("Type", 4) Spellbook.SetupSpellIcons(CurrentWindow, 1024, TopIndex, ActionBarControlOffset) elif level == 9: # songs selection GemRB.SetVar ("Type", 5) diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp index 1f7988e..e25e111 100644 --- a/gemrb/plugins/GUIScript/GUIScript.cpp +++ b/gemrb/plugins/GUIScript/GUIScript.cpp @@ -8732,7 +8732,7 @@ static PyObject* GemRB_Window_SetupControls(PyObject * /*self*/, PyObject* args) break; case ACT_STEALTH: //don't use level control for this, iwd2 allows everyone to sneak - if (!(actor->GetStat(IE_STEALTH)+actor->GetStat(IE_HIDEINSHADOWS) ) ) { + if ((actor->GetStat(IE_STEALTH)+actor->GetStat(IE_HIDEINSHADOWS) )<=0 ) { state = IE_GUI_BUTTON_DISABLED; } else { if (modalstate==MS_STEALTH) { @@ -8750,7 +8750,12 @@ static PyObject* GemRB_Window_SetupControls(PyObject * /*self*/, PyObject* args) break; case ACT_THIEVING: //don't use level control for this, iwd2 allows everyone to steal - if (!(actor->GetStat(IE_LOCKPICKING)+actor->GetStat(IE_PICKPOCKET) ) ) { + if ((actor->GetStat(IE_LOCKPICKING)+actor->GetStat(IE_PICKPOCKET) )<=0 ) { + state = IE_GUI_BUTTON_DISABLED; + } + break; + case ACT_TAMING: + if (actor->GetStat(IE_ANIMALS)<=0 ) { state = IE_GUI_BUTTON_DISABLED; } break; ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |