From: Jaka K. <lyn...@us...> - 2012-06-13 22:26:36
|
gemrb: Infinity Engine emulator The branch master has been updated via 6d090fb7d708c05a9a8ee981acaac608664e1519 (commit) via 34e9e386ea226ef754c5ca51176ca8aac4ead623 (commit) Summary of changes: .mailmap | 1 + gemrb/GUIScripts/bg1/GUIOPT.py | 4 +++- gemrb/GUIScripts/bg2/GUIOPT.py | 4 +++- gemrb/GUIScripts/iwd/GUIOPT.py | 4 +++- gemrb/GUIScripts/iwd2/GUIOPT.py | 4 +++- gemrb/GUIScripts/pst/GUIOPT.py | 6 +++++- gemrb/core/Scriptable/Actor.cpp | 8 ++++---- 7 files changed, 22 insertions(+), 9 deletions(-) from 7936d4a47379c75b86bcbe4c04b07498353a660d (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=6d090fb7d708c05a9a8ee981acaac608664e1519 commit 6d090fb7d708c05a9a8ee981acaac608664e1519 Author: Jaka Kranjc <lyn...@us...> Date: Thu Jun 14 00:21:16 2012 +0200 added mailmap entry for decker diff --git a/.mailmap b/.mailmap index 0f5cbc3..bf0057f 100644 --- a/.mailmap +++ b/.mailmap @@ -1,3 +1,4 @@ Jaka Kranjc <lyn...@us...> <lyn...@so...> Edheldil <edh...@us...> Jarda Benkovsky <benkovsk@totoro.(none)> Avenger <ave...@so...> unknown <Laci@.(none)> +Thomas Gull <tg...@dm...> Tommy Gunn <ola...@us...> http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=34e9e386ea226ef754c5ca51176ca8aac4ead623 commit 34e9e386ea226ef754c5ca51176ca8aac4ead623 Author: Thomas Gull <tg...@dm...> Date: Wed Jun 13 15:19:22 2012 -0600 Corrected marker feedback (circles) so now uses the 1-5 values that IE uses, does not use 1-6 of BG2. Slider in Feedback Options will work properly now. Signed-off-by: Jaka Kranjc <lyn...@us...> diff --git a/gemrb/GUIScripts/bg1/GUIOPT.py b/gemrb/GUIScripts/bg1/GUIOPT.py index cd46db0..d7ad441 100644 --- a/gemrb/GUIScripts/bg1/GUIOPT.py +++ b/gemrb/GUIScripts/bg1/GUIOPT.py @@ -417,11 +417,12 @@ def OpenFeedbackOptionsWindow (): SubSubOptionsWindow = Window = GemRB.LoadWindow (9) HelpTextArea2 = OptHelpText ('FeedbackOptions', Window, 28, 18043) + GemRB.SetVar ("Circle Feedback", GemRB.GetVar ("GUI Feedback Level") - 1) OptDone ('FeedbackOptions', Window, 26) OptCancel ('FeedbackOptions', Window, 27) - OptSlider ('MarkerFeedback', Window, 8, 'GUI Feedback Level', 1) + OptSlider ('MarkerFeedback', Window, 8, 'Circle Feedback', 1) OptSlider ('LocatorFeedback', Window, 9, 'Locator Feedback Level', 1) OptCheckbox ('ToHitRolls', Window, 10, 32, 'Rolls', 1) @@ -436,6 +437,7 @@ def OpenFeedbackOptionsWindow (): def DisplayHelpMarkerFeedback (): HelpTextArea2.SetText (18024) + GemRB.SetVar ("GUI Feedback Level", GemRB.GetVar ("Circle Feedback") + 1) def DisplayHelpLocatorFeedback (): HelpTextArea2.SetText (18025) diff --git a/gemrb/GUIScripts/bg2/GUIOPT.py b/gemrb/GUIScripts/bg2/GUIOPT.py index 40239a4..404f920 100644 --- a/gemrb/GUIScripts/bg2/GUIOPT.py +++ b/gemrb/GUIScripts/bg2/GUIOPT.py @@ -413,11 +413,12 @@ def OpenFeedbackOptionsWindow (): GameOptionsWindow = Window = GemRB.LoadWindow (9) HelpTextArea = OptHelpText ('FeedbackOptions', Window, 28, 18043) + GemRB.SetVar ("Circle Feedback", GemRB.GetVar ("GUI Feedback Level") - 1) OptDone ('FeedbackOptions', Window, 26) OptCancel ('FeedbackOptions', Window, 27) - OptSlider ('MarkerFeedback', Window, 8, 'GUI Feedback Level', 1) + OptSlider ('MarkerFeedback', Window, 8, 'Circle Feedback', 1) OptSlider ('LocatorFeedback', Window, 9, 'Locator Feedback Level', 1) OptCheckbox ('ToHitRolls', Window, 10, 32, 'Rolls', 1) @@ -432,6 +433,7 @@ def OpenFeedbackOptionsWindow (): def DisplayHelpMarkerFeedback (): HelpTextArea.SetText (18024) + GemRB.SetVar ("GUI Feedback Level", GemRB.GetVar ("Circle Feedback") + 1) def DisplayHelpLocatorFeedback (): HelpTextArea.SetText (18025) diff --git a/gemrb/GUIScripts/iwd/GUIOPT.py b/gemrb/GUIScripts/iwd/GUIOPT.py index 5946b14..1bd588a 100644 --- a/gemrb/GUIScripts/iwd/GUIOPT.py +++ b/gemrb/GUIScripts/iwd/GUIOPT.py @@ -356,11 +356,12 @@ def OpenFeedbackOptionsWindow (): GameOptionsWindow = Window = GemRB.LoadWindow (9) HelpTextArea = OptHelpText ('FeedbackOptions', Window, 28, 18043) + GemRB.SetVar ("Circle Feedback", GemRB.GetVar ("GUI Feedback Level") - 1) OptDone ('FeedbackOptions', Window, 26) OptCancel ('FeedbackOptions', Window, 27) - OptSlider ('MarkerFeedback', Window, 8, 'GUI Feedback Level', 1) + OptSlider ('MarkerFeedback', Window, 8, 'Circle Feedback', 1) OptSlider ('LocatorFeedback', Window, 9, 'Locator Feedback Level', 1) OptCheckbox ('ToHitRolls', Window, 10, 32, 'Rolls', 1) @@ -374,6 +375,7 @@ def OpenFeedbackOptionsWindow (): def DisplayHelpMarkerFeedback (): HelpTextArea.SetText (18024) + GemRB.SetVar ("GUI Feedback Level", GemRB.GetVar ("Circle Feedback") + 1) def DisplayHelpLocatorFeedback (): HelpTextArea.SetText (18025) diff --git a/gemrb/GUIScripts/iwd2/GUIOPT.py b/gemrb/GUIScripts/iwd2/GUIOPT.py index b400afe..7893a54 100644 --- a/gemrb/GUIScripts/iwd2/GUIOPT.py +++ b/gemrb/GUIScripts/iwd2/GUIOPT.py @@ -347,11 +347,12 @@ def OpenFeedbackOptionsWindow (): GameOptionsWindow = Window = GemRB.LoadWindow (9) HelpTextArea = OptHelpText ('FeedbackOptions', Window, 28, 18043) + GemRB.SetVar ("Circle Feedback", GemRB.GetVar ("GUI Feedback Level") - 1) OptDone ('FeedbackOptions', Window, 26) OptCancel ('FeedbackOptions', Window, 27) - OptSlider ('MarkerFeedback', Window, 8, 'GUI Feedback Level', 1) + OptSlider ('MarkerFeedback', Window, 8, 'Circle Feedback', 1) OptSlider ('LocatorFeedback', Window, 9, 'Locator Feedback Level', 1) OptCheckbox ('ToHitRolls', Window, 10, 32, 'Rolls', 1) @@ -366,6 +367,7 @@ def OpenFeedbackOptionsWindow (): def DisplayHelpMarkerFeedback (): HelpTextArea.SetText (18024) + GemRB.SetVar ("GUI Feedback Level", GemRB.GetVar ("Circle Feedback") + 1) def DisplayHelpLocatorFeedback (): HelpTextArea.SetText (18025) diff --git a/gemrb/GUIScripts/pst/GUIOPT.py b/gemrb/GUIScripts/pst/GUIOPT.py index eca9ed8..80559a8 100644 --- a/gemrb/GUIScripts/pst/GUIOPT.py +++ b/gemrb/GUIScripts/pst/GUIOPT.py @@ -397,6 +397,7 @@ def OpenFeedbackOptionsWindow (): FeedbackOptionsWindow = Window = GemRB.LoadWindow (8) GemRB.SetVar ("FloatWindow", FeedbackOptionsWindow.ID) + GemRB.SetVar ("Circle Feedback", GemRB.GetVar ("GUI Feedback Level") - 1) FeedbackHelpText = OptHelpText ('FeedbackOptions', Window, 9, 37410) @@ -404,7 +405,7 @@ def OpenFeedbackOptionsWindow (): OptDone ('FeedbackOptions', Window, 7) OptCancel ('FeedbackOptions', Window, 8) - OptSlider ('FeedbackOptions', 'MarkerFeedback', Window, 1, 10, 37463, "GUI Feedback Level") + OptSlider ('FeedbackOptions', 'MarkerFeedback', Window, 1, 10, 37463, "Circle Feedback", UpdateMarkerFeedback) OptSlider ('FeedbackOptions', 'LocatorFeedback', Window, 2, 11, 37586, "Locator Feedback Level") OptSlider ('FeedbackOptions', 'SelectionFeedbackLevel', Window, 20, 21, 54879, "Selection Sounds Frequency") OptSlider ('FeedbackOptions', 'CommandFeedbackLevel', Window, 22, 23, 55012, "Command Sounds Frequency") @@ -419,6 +420,9 @@ def OpenFeedbackOptionsWindow (): GemRB.UnhideGUI () Window.ShowModal (MODAL_SHADOW_GRAY) +def UpdateMarkerFeedback (): + GemRB.SetVar ("GUI Feedback Level", GemRB.GetVar ("Circle Feedback") + 1) + def DisplayHelpMarkerFeedback (): FeedbackHelpText.SetText (37411) diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp index 9710fe8..3de2928 100644 --- a/gemrb/core/Scriptable/Actor.cpp +++ b/gemrb/core/Scriptable/Actor.cpp @@ -6546,8 +6546,8 @@ void Actor::Draw(const Region &screen) ieDword markerfeedback = 4; core->GetDictionary()->Lookup("GUI Feedback Level", markerfeedback); if (Over) { - // picked creature - drawcircle = markerfeedback >= 1; + // picked creature, should always be true + drawcircle = true; } else if (Selected) { // selected creature drawcircle = markerfeedback >= 2; @@ -6556,10 +6556,10 @@ void Actor::Draw(const Region &screen) drawcircle = markerfeedback >= 3; } else if (Modified[IE_EA] >= EA_EVILCUTOFF) { // hostile - drawcircle = markerfeedback >= 5; + drawcircle = markerfeedback >= 4; } else { // all - drawcircle = markerfeedback >= 6; + drawcircle = markerfeedback >= 5; } } if (drawcircle) { ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |