rendered paste bodydiff --git a/gemrb/GUIScripts/bg1/GUIINV.py b/gemrb/GUIScripts/bg1/GUIINV.pyindex 2da0863..a408073 100644--- a/gemrb/GUIScripts/bg1/GUIINV.py+++ b/gemrb/GUIScripts/bg1/GUIINV.py@@ -86,12 +86,12 @@ def OpenInventoryWindow (): GemRB.SetVar ("MessageLabel", Window.GetControl (0x1000003f).ID ) OldOptionsWindow = GUICommonWindows.OptionsWindow OptionsWindow = GemRB.LoadWindow (0)- OptionsWindow.SetFrame () GUICommonWindows.SetupMenuWindowControls (OptionsWindow, 0, OpenInventoryWindow)- #saving the original portrait window+ #saving the original portrait window OldPortraitWindow = GUICommonWindows.PortraitWindow PortraitWindow = GUICommonWindows.OpenPortraitWindow (0)-+ OptionsWindow.SetFrame ()+ #ground items scrollbar ScrollBar = Window.GetControl (66) ScrollBar.SetEvent (IE_GUI_SCROLLBAR_ON_CHANGE, RefreshInventoryWindow)diff --git a/gemrb/GUIScripts/bg1/GUIMA.py b/gemrb/GUIScripts/bg1/GUIMA.pyindex b69eb7d..efdbfdb 100644--- a/gemrb/GUIScripts/bg1/GUIMA.py+++ b/gemrb/GUIScripts/bg1/GUIMA.py@@ -36,7 +36,7 @@ OptionsWindow = None OldOptionsWindow = None def RevealMap ():- global MapWindow+ global MapWindow, PortraitWindow global OldPortraitWindow, OldOptionsWindow if GUICommon.CloseOtherWindow (ShowMap):diff --git a/gemrb/GUIScripts/bg1/GUIMG.py b/gemrb/GUIScripts/bg1/GUIMG.pyindex ca0ab10..77eab8b 100644--- a/gemrb/GUIScripts/bg1/GUIMG.py+++ b/gemrb/GUIScripts/bg1/GUIMG.py@@ -48,7 +48,7 @@ def OpenMageWindow (): if OptionsWindow: OptionsWindow.Unload () if PortraitWindow:- PortraitWindow.Unload ()+ PortraitWindow.Unload () MageWindow = None GemRB.SetVar ("OtherWindow", -1) GUICommon.GameWindow.SetVisible(WINDOW_VISIBLE)diff --git a/gemrb/GUIScripts/bg1/GUIOPT.py b/gemrb/GUIScripts/bg1/GUIOPT.pyindex ce3fb10..375c593 100644--- a/gemrb/GUIScripts/bg1/GUIOPT.py+++ b/gemrb/GUIScripts/bg1/GUIOPT.py@@ -17,47 +17,31 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # --# GUIOPT.py - scripts to control options windows mostly from GUIOPT winpack--# GUIOPT:-# 0 - Main options window (peacock tail)-# 1 - Video options window-# 2 - msg win with 1 button-# 3 - msg win with 2 buttons-# 4 - msg win with 3 buttons-# 5 - Audio options window-# 6 - Gameplay options window-# 8 - Feedback options window-# 9 - Autopause options window-+# GUIOPT.py - scripts to control options windows mostly from the GUIOPT winpack+# Ingame options ################################################### import GemRB+from GUIDefines import * import GUICommon-import GUICommonWindows import GUISAVE-from GUIDefines import *- + ###################################################-OptionsWindow = None-SubOptionsWindow = None-SubSubOptionsWindow = None GameOptionsWindow = None+PortraitWindow = None+OldPortraitWindow = None+OptionsWindow = None OldOptionsWindow = None-MoviesWindow = None-KeysWindow = None HelpTextArea = None-HelpTextArea2 = None LoadMsgWindow = None QuitMsgWindow = None-hideflag = None- +################################################### def CloseOptionsWindow ():- global GameOptionsWindow, OptionsWindow- global OldOptionsWindow+ import GUICommonWindows+ global GameOptionsWindow, OptionsWindow, PortraitWindow+ global OldPortraitWindow, OldOptionsWindow if GameOptionsWindow == None: return@@ -66,42 +50,56 @@ def CloseOptionsWindow (): GameOptionsWindow.Unload () if OptionsWindow: OptionsWindow.Unload ()+ if PortraitWindow:+ PortraitWindow.Unload () GameOptionsWindow = None- GUICommonWindows.SetSelectionChangeHandler (None) GemRB.SetVar ("OtherWindow", -1) GUICommon.GameWindow.SetVisible(WINDOW_VISIBLE)+ GemRB.UnhideGUI () GUICommonWindows.OptionsWindow = OldOptionsWindow OldOptionsWindow = None- return--def DummyWindow ():+ GUICommonWindows.PortraitWindow = OldPortraitWindow+ OldPortraitWindow = None return ################################################### def OpenOptionsWindow ():- """Open main options window"""- global GameOptionsWindow, OptionsWindow- global OldOptionsWindow+ import GUICommonWindows+ global GameOptionsWindow, OptionsWindow, PortraitWindow+ global OldPortraitWindow, OldOptionsWindow - if GUICommon.CloseOtherWindow(OpenOptionsWindow):+ if GUICommon.CloseOtherWindow (OpenOptionsWindow): CloseOptionsWindow() return - #hideflag = GemRB.HideGUI ()+ hideflag = GemRB.HideGUI () GUICommon.GameWindow.SetVisible(WINDOW_INVISIBLE)- GUICommonWindows.SetSelectionChangeHandler (DummyWindow) GemRB.LoadWindowPack ("GUIOPT", 640, 480) GameOptionsWindow = Window = GemRB.LoadWindow (2) GemRB.SetVar ("OtherWindow", GameOptionsWindow.ID)- if OldOptionsWindow == None:+ #saving the original portrait window+ if OldPortraitWindow == None: OldOptionsWindow = GUICommonWindows.OptionsWindow OptionsWindow = GemRB.LoadWindow (0)+ GUICommonWindows.MarkMenuButton (OptionsWindow) GUICommonWindows.SetupMenuWindowControls (OptionsWindow, 0, OpenOptionsWindow) OptionsWindow.SetFrame ()+ OldPortraitWindow = GUICommonWindows.PortraitWindow+ PortraitWindow = GUICommonWindows.OpenPortraitWindow (0)++ # Return to Game+ Button = Window.GetControl (11)+ Button.SetText (10308)+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenOptionsWindow)++ # Quit Game+ Button = Window.GetControl (10)+ Button.SetText (13731)+ Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenQuitMsgWindow) - # Load game+ # Load Game Button = Window.GetControl (5) Button.SetText (13729) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenLoadMsgWindow)@@ -111,61 +109,46 @@ def OpenOptionsWindow (): Button.SetText (13730) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenSaveMsgWindow) - # Quit Game- Button = Window.GetControl (10)- Button.SetText (13731)- Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenQuitMsgWindow)-- # Graphics+ # Video Options Button = Window.GetControl (7) Button.SetText (17162) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenVideoOptionsWindow) - # Audio+ # Audio Options Button = Window.GetControl (8) Button.SetText (17164) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenAudioOptionsWindow) - # Gameplay+ # Gameplay Options Button = Window.GetControl (9) Button.SetText (17165)- #Button.SetText (10308) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenGameplayOptionsWindow) - # Return to game- Button = Window.GetControl (11)- Button.SetText (10308)- Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, OpenOptionsWindow)- # game version, e.g. v1.1.0000 Label = Window.GetControl (0x1000000b) Label.SetText (GEMRB_VERSION) OptionsWindow.SetVisible (WINDOW_VISIBLE) Window.SetVisible (WINDOW_VISIBLE)- GUICommonWindows.PortraitWindow.SetVisible (WINDOW_VISIBLE)+ PortraitWindow.SetVisible (WINDOW_VISIBLE) return - ###################################################-def CloseVideoOptionsWindow ():- global SubOptionsWindow - if SubOptionsWindow:- SubOptionsWindow.Unload()- SubOptionsWindow = None- return+def CloseVideoOptionsWindow ():+ OpenOptionsWindow ()+ OpenOptionsWindow () def OpenVideoOptionsWindow (): """Open video options window"""- global SubOptionsWindow, HelpTextArea+ global GameOptionsWindow, HelpTextArea - if SubOptionsWindow:- if SubOptionsWindow:- SubOptionsWindow.Unload()- SubOptionsWindow = None + if GameOptionsWindow:+ if GameOptionsWindow:+ GameOptionsWindow.Unload ()+ GameOptionsWindow = None - SubOptionsWindow = Window = GemRB.LoadWindow (6)+ GameOptionsWindow = Window = GemRB.LoadWindow (6) HelpTextArea = OptHelpText ('VideoOptions', Window, 33, 18038) @@ -178,6 +161,7 @@ def OpenVideoOptionsWindow (): OptRadio ('BPP', Window, 5, 37, 'BitsPerPixel', 16) OptRadio ('BPP', Window, 6, 37, 'BitsPerPixel', 24) OptRadio ('BPP', Window, 7, 37, 'BitsPerPixel', 32)+ OptCheckbox ('FullScreen', Window, 9, 38, 'Full Screen', 1) OptCheckbox ('TransShadow', Window, 51, 50, 'Translucent Shadows', 1)@@ -185,8 +169,8 @@ def OpenVideoOptionsWindow (): OptCheckbox ('SoftTransBlt', Window, 41, 46, 'SoftSrcKeyBlt' ,1) OptCheckbox ('SoftStandBlt', Window, 42, 48, 'SoftBltFast' ,1) - Window.ShowModal (MODAL_SHADOW_GRAY)-+ GameOptionsWindow.ShowModal (MODAL_SHADOW_GRAY)+ return def DisplayHelpFullScreen (): HelpTextArea.SetText (18000)@@ -197,11 +181,11 @@ def DisplayHelpBPP (): def DisplayHelpBrightness (): HelpTextArea.SetText (17203)- GemRB.SetGamma (GemRB.GetVar("Brightness Correction"),GemRB.GetVar("Gamma Correction")/2)+ GemRB.SetGamma (GemRB.GetVar("Brightness Correction"),GemRB.GetVar("Gamma Correction")) def DisplayHelpContrast (): HelpTextArea.SetText (17204)- GemRB.SetGamma (GemRB.GetVar("Brightness Correction"),GemRB.GetVar("Gamma Correction")/2)+ GemRB.SetGamma (GemRB.GetVar("Brightness Correction"),GemRB.GetVar("Gamma Correction")) def DisplayHelpSoftMirrBlt (): HelpTextArea.SetText (18004)@@ -219,28 +203,22 @@ def DisplayHelpTransShadow (): ################################################### def CloseAudioOptionsWindow ():- global SubOptionsWindow-- if SubOptionsWindow:- SubOptionsWindow.Unload()- SubOptionsWindow = None- return+ OpenOptionsWindow ()+ OpenOptionsWindow () def OpenAudioOptionsWindow (): """Open audio options window"""- global SubOptionsWindow, HelpTextArea+ global GameOptionsWindow, HelpTextArea - if SubOptionsWindow:- if SubOptionsWindow:- SubOptionsWindow.Unload ()- SubOptionsWindow = None + if GameOptionsWindow:+ if GameOptionsWindow:+ GameOptionsWindow.Unload ()+ GameOptionsWindow = None - SubOptionsWindow = Window = GemRB.LoadWindow (7)+ GameOptionsWindow = Window = GemRB.LoadWindow (7) HelpTextArea = OptHelpText ('AudioOptions', Window, 14, 18040) - Window.DeleteControl(16)- OptDone ('AudioOptions', Window, 24) OptCancel ('AudioOptions', Window, 25) OptButton ('CharacterSounds', Window, 13, 17778)@@ -252,13 +230,12 @@ def OpenAudioOptionsWindow (): OptSlider ('MovieVolume', Window, 22, 'Volume Movie', 10) OptCheckbox ('CreativeEAX', Window, 26, 28, 'Environmental Audio', 1)+ GameOptionsWindow.ShowModal (MODAL_SHADOW_GRAY) - Window.ShowModal (MODAL_SHADOW_GRAY)- return def DisplayHelpAmbientVolume (): HelpTextArea.SetText (18008)- GemRB.UpdateAmbientsVolume ()+ GemRB.UpdateAmbientsVolume() def DisplayHelpSoundFXVolume (): HelpTextArea.SetText (18009)@@ -268,7 +245,7 @@ def DisplayHelpVoiceVolume (): def DisplayHelpMusicVolume (): HelpTextArea.SetText (18011)- GemRB.UpdateMusicVolume ()+ GemRB.UpdateMusicVolume() def DisplayHelpMovieVolume (): HelpTextArea.SetText (18012)@@ -276,79 +253,25 @@ def DisplayHelpMovieVolume (): def DisplayHelpCreativeEAX (): HelpTextArea.SetText (18022) -###################################################--def CloseCharacterSoundsWindow ():- global SubSubOptionsWindow-- if SubSubOptionsWindow:- SubSubOptionsWindow.Unload ()- SubSubOptionsWindow = None- return--def OpenCharacterSoundsWindow ():- """Open character sounds window"""- global SubSubOptionsWindow, HelpTextArea2-- if SubSubOptionsWindow:- if SubSubOptionsWindow:- SubSubOptionsWindow.Unload ()- SubSubOptionsWindow = None-- SubSubOptionsWindow = Window = GemRB.LoadWindow (12)-- HelpTextArea2 = OptHelpText ('CharacterSounds', Window, 16, 18041)-- OptDone ('CharacterSounds', Window, 24)- OptCancel ('CharacterSounds', Window, 25)-- OptCheckbox ('Subtitles', Window, 5, 20, 'Subtitles', 1)- OptCheckbox ('AttackSounds', Window, 6, 18, 'Attack Sounds', 1)- OptCheckbox ('Footsteps', Window, 7, 19, 'Footsteps', 1)- OptRadio ('CommandSounds', Window, 8, 21, 'Command Sounds Frequency', 1)- OptRadio ('CommandSounds', Window, 9, 21, 'Command Sounds Frequency', 2)- OptRadio ('CommandSounds', Window, 10, 21, 'Command Sounds Frequency', 3)- OptRadio ('SelectionSounds', Window, 58, 57, 'Selection Sounds Frequency', 1)- OptRadio ('SelectionSounds', Window, 59, 57, 'Selection Sounds Frequency', 2)- OptRadio ('SelectionSounds', Window, 60, 57, 'Selection Sounds Frequency', 3)-- Window.ShowModal (MODAL_SHADOW_GRAY) --def DisplayHelpSubtitles ():- HelpTextArea2.SetText (18015)--def DisplayHelpAttackSounds ():- HelpTextArea2.SetText (18013)--def DisplayHelpFootsteps ():- HelpTextArea2.SetText (18014)--def DisplayHelpCommandSounds ():- HelpTextArea2.SetText (18016)--def DisplayHelpSelectionSounds ():- HelpTextArea2.SetText (11352) ################################################### def CloseGameplayOptionsWindow ():- global SubOptionsWindow- - if SubOptionsWindow:- SubOptionsWindow.Unload()- SubOptionsWindow = None- return- + OpenOptionsWindow ()+ OpenOptionsWindow ()+ def OpenGameplayOptionsWindow (): """Open gameplay options window"""- global SubOptionsWindow, HelpTextArea+ global GameOptionsWindow, HelpTextArea++ if GameOptionsWindow:+ if GameOptionsWindow:+ GameOptionsWindow.Unload ()+ GameOptionsWindow = None - if SubOptionsWindow:- if SubOptionsWindow:- SubOptionsWindow.Unload ()- SubOptionsWindow = None + #gameplayoptions+ GameOptionsWindow = Window = GemRB.LoadWindow (8) - SubOptionsWindow = Window = GemRB.LoadWindow (8) HelpTextArea = OptHelpText ('GameplayOptions', Window, 40, 18042) @@ -363,13 +286,13 @@ def OpenGameplayOptionsWindow (): OptCheckbox ('DitherAlways', Window, 14, 25, 'Always Dither', 1) OptCheckbox ('Gore', Window, 19, 27, 'Gore', 1) OptCheckbox ('Infravision', Window, 42, 44, 'Infravision', 1)- OptCheckbox ('Weather', Window, 47, 46, 'Weather', 1) + OptCheckbox ('Weather', Window, 47, 46, 'Weather', 1) OptButton ('FeedbackOptions', Window, 5, 17163) OptButton ('AutopauseOptions', Window, 6, 17166) - Window.ShowModal (MODAL_SHADOW_GRAY)-+ GameOptionsWindow.ShowModal (MODAL_SHADOW_GRAY)+ return def DisplayHelpTooltipDelay (): HelpTextArea.SetText (18017)@@ -392,51 +315,54 @@ def DisplayHelpGore (): HelpTextArea.SetText (18023) def DisplayHelpInfravision ():- HelpTextArea.SetText (11797) + HelpTextArea.SetText (11797) def DisplayHelpWeather (): HelpTextArea.SetText (20619)- -def DisplayHelpRestUntilHealed ():- HelpTextArea.SetText (2242) +def DisplayHelpRestUntilHealed ():+ HelpTextArea.SetText (2242) ###################################################+ def CloseFeedbackOptionsWindow ():- global SubSubOptionsWindow+ global GameOptionsWindow++ if GameOptionsWindow:+ GameOptionsWindow.Unload ()+ GameOptionsWindow = None+ OpenGameplayOptionsWindow () - if SubSubOptionsWindow:- SubSubOptionsWindow.Unload ()- SubSubOptionsWindow = None- return def OpenFeedbackOptionsWindow (): """Open feedback options window"""- global SubSubOptionsWindow, HelpTextArea2+ global GameOptionsWindow, HelpTextArea - if SubSubOptionsWindow:- if SubSubOptionsWindow:- SubSubOptionsWindow.Unload ()- SubSubOptionsWindow = None + if GameOptionsWindow:+ if GameOptionsWindow:+ GameOptionsWindow.Unload ()+ GameOptionsWindow = None - SubSubOptionsWindow = Window = GemRB.LoadWindow (9)+ #feedback+ GameOptionsWindow = Window = GemRB.LoadWindow (9) - HelpTextArea2 = OptHelpText ('FeedbackOptions', Window, 28, 18043)+ HelpTextArea = OptHelpText ('FeedbackOptions', Window, 28, 18043) OptDone ('FeedbackOptions', Window, 26) OptCancel ('FeedbackOptions', Window, 27) OptSlider ('MarkerFeedback', Window, 8, 'GUI Feedback Level', 1)- OptSlider ('LocatorFeedback', Window, 9, 'Locator Feedback Level', 1) + OptSlider ('LocatorFeedback', Window, 9, 'Locator Feedback Level', 1)+ OptCheckbox ('ToHitRolls', Window, 10, 32, 'Rolls', 1) OptCheckbox ('CombatInfo', Window, 11, 33, 'Combat Info', 1) OptCheckbox ('Actions', Window, 12, 34, 'Actions', 1) OptCheckbox ('States', Window, 13, 35, 'State Changes', 1) OptCheckbox ('Selection', Window, 14, 36, 'Selection Text', 1)- OptCheckbox ('Miscellaneous', Window, 15, 37, 'Miscellaneous Text', 1) + OptCheckbox ('Miscellaneous', Window, 15, 37, 'Miscellaneous Text', 1) Window.ShowModal (MODAL_SHADOW_GRAY)-+ return def DisplayHelpMarkerFeedback (): HelpTextArea.SetText (18024)@@ -445,45 +371,47 @@ def DisplayHelpLocatorFeedback (): HelpTextArea.SetText (18025) def DisplayHelpToHitRolls ():- HelpTextArea2.SetText (18026)+ HelpTextArea.SetText (18026) def DisplayHelpCombatInfo ():- HelpTextArea2.SetText (18027)+ HelpTextArea.SetText (18027) def DisplayHelpActions ():- HelpTextArea2.SetText (18028)+ HelpTextArea.SetText (18028) def DisplayHelpStates ():- HelpTextArea2.SetText (18029)+ HelpTextArea.SetText (18029) def DisplayHelpSelection ():- HelpTextArea2.SetText (18030)+ HelpTextArea.SetText (18030) def DisplayHelpMiscellaneous ():- HelpTextArea2.SetText (18031)+ HelpTextArea.SetText (18031)+ ################################################### def CloseAutopauseOptionsWindow ():- global SubSubOptionsWindow+ global GameOptionsWindow - if SubSubOptionsWindow:- SubSubOptionsWindow.Unload ()- SubSubOptionsWindow = None+ if GameOptionsWindow:+ GameOptionsWindow.Unload ()+ GameOptionsWindow = None+ OpenGameplayOptionsWindow () return def OpenAutopauseOptionsWindow (): """Open autopause options window"""- global SubSubOptionsWindow, HelpTextArea2+ global GameOptionsWindow, HelpTextArea - if SubSubOptionsWindow:- if SubSubOptionsWindow:- SubSubOptionsWindow.Unload ()- SubSubOptionsWindow = None + if GameOptionsWindow:+ if GameOptionsWindow:+ GameOptionsWindow.Unload ()+ GameOptionsWindow = None - SubSubOptionsWindow = Window = GemRB.LoadWindow (10)+ GameOptionsWindow = Window = GemRB.LoadWindow (10) - HelpTextArea2 = OptHelpText ('AutopauseOptions', Window, 15, 18044)+ HelpTextArea = OptHelpText ('AutopauseOptions', Window, 15, 18044) OptDone ('AutopauseOptions', Window, 11) OptCancel ('AutopauseOptions', Window, 14)@@ -499,7 +427,7 @@ def OpenAutopauseOptionsWindow (): OptCheckbox ('EnemySighted', Window, 26, 27, 'Auto Pause State', 128) Window.ShowModal (MODAL_SHADOW_GRAY)-+ return def DisplayHelpCharacterHit (): HelpTextArea.SetText (18032)@@ -525,6 +453,68 @@ def DisplayHelpEndOfRound (): def DisplayHelpEnemySighted (): HelpTextArea.SetText (23514) +def DisplayHelpSpellCast ():+ HelpTextArea.SetText (58171)++def DisplayHelpTrapFound ():+ HelpTextArea.SetText (31872)++def DisplayHelpCenterOnActor ():+ HelpTextArea.SetText (10571)++###################################################++def CloseCharacterSoundsWindow ():+ global GameOptionsWindow++ if GameOptionsWindow:+ GameOptionsWindow.Unload ()+ GameOptionsWindow = None+ OpenAudioOptionsWindow ()+ return++def OpenCharacterSoundsWindow ():+ """Open character sounds window"""+ global GameOptionsWindow, HelpTextArea++ if GameOptionsWindow:+ if GameOptionsWindow:+ GameOptionsWindow.Unload ()+ GameOptionsWindow = None++ GameOptionsWindow = Window = GemRB.LoadWindow (12)++ HelpTextArea = OptHelpText ('CharacterSounds', Window, 16, 18041)++ OptDone ('CharacterSounds', Window, 24)+ OptCancel ('CharacterSounds', Window, 25)++ OptCheckbox ('Subtitles', Window, 5, 20, 'Subtitles', 1)+ OptCheckbox ('AttackSounds', Window, 6, 18, 'Attack Sounds', 1)+ OptCheckbox ('Footsteps', Window, 7, 19, 'Footsteps', 1)+ OptRadio ('CommandSounds', Window, 8, 21, 'Command Sounds Frequency', 1)+ OptRadio ('CommandSounds', Window, 9, 21, 'Command Sounds Frequency', 2)+ OptRadio ('CommandSounds', Window, 10, 21, 'Command Sounds Frequency', 3)+ OptRadio ('SelectionSounds', Window, 58, 57, 'Selection Sounds Frequency', 1)+ OptRadio ('SelectionSounds', Window, 59, 57, 'Selection Sounds Frequency', 2)+ OptRadio ('SelectionSounds', Window, 60, 57, 'Selection Sounds Frequency', 3)++ Window.ShowModal (MODAL_SHADOW_GRAY)++def DisplayHelpSubtitles ():+ HelpTextArea.SetText (18015)++def DisplayHelpAttackSounds ():+ HelpTextArea.SetText (18013)++def DisplayHelpFootsteps ():+ HelpTextArea.SetText (18014)++def DisplayHelpCommandSounds ():+ HelpTextArea.SetText (18016)++def DisplayHelpSelectionSounds ():+ HelpTextArea.SetText (11352) ################################################### @@ -559,6 +549,7 @@ def OpenLoadMsgWindow (): Text.SetText (19531) Window.ShowModal (MODAL_SHADOW_GRAY)+ return def CloseLoadMsgWindow (): global LoadMsgWindow@@ -566,7 +557,9 @@ def CloseLoadMsgWindow (): if LoadMsgWindow: LoadMsgWindow.Unload () LoadMsgWindow = None- #OptionsWindow.SetVisible (WINDOW_VISIBLE)+ OptionsWindow.SetVisible (WINDOW_VISIBLE)+ GameOptionsWindow.SetVisible (WINDOW_VISIBLE)+ PortraitWindow.SetVisible (WINDOW_VISIBLE) return def LoadGamePress ():@@ -580,7 +573,8 @@ def LoadGamePress (): GemRB.SetNextScript ("GUILOAD") return -def SaveGamePress():+#save game AND quit+def SaveGamePress (): global QuitMsgWindow if QuitMsgWindow:@@ -592,7 +586,7 @@ def SaveGamePress(): GUISAVE.OpenSaveWindow () return -def QuitGamePress():+def QuitGamePress (): global QuitMsgWindow if QuitMsgWindow:@@ -628,9 +622,9 @@ def OpenQuitMsgWindow (): Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, CloseQuitMsgWindow) - # Do you wish to save the game ....+ # The game has not been saved .... Text = Window.GetControl (3)- Text.SetText (16456) # or ??? - cannot be saved atm+ Text.SetText (16456) Window.ShowModal (MODAL_SHADOW_GRAY) return@@ -642,10 +636,21 @@ def CloseQuitMsgWindow (): QuitMsgWindow.Unload () QuitMsgWindow = None OptionsWindow.SetVisible (WINDOW_VISIBLE)+ GameOptionsWindow.SetVisible (WINDOW_VISIBLE)+ PortraitWindow.SetVisible (WINDOW_VISIBLE) return +###################################################+#TODO+def OpenHotkeyOptionsWindow ():+ return +def CloseotkeyOptionsWindow ():+ return++################################################### ###################################################+ # These functions help to setup controls found # in Video, Audio, Gameplay, Feedback and Autopause # options windows@@ -653,18 +658,12 @@ def CloseQuitMsgWindow (): # These controls are usually made from an active # control (button, slider ...) and a label + def OptSlider (name, window, slider_id, variable, value): """Standard slider for option windows""" slider = window.GetControl (slider_id) slider.SetVarAssoc (variable, value) slider.SetEvent (IE_GUI_SLIDER_ON_CHANGE, eval("DisplayHelp" + name))-- #label = window.GetControl (label_id)- #label.SetText (label_strref)- #label.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_SET)- #label.SetState (IE_GUI_BUTTON_LOCKED)- #label.SetEvent (IE_GUI_MOUSE_ENTER_BUTTON, eval("DisplayHelp" + name))- return slider def OptRadio (name, window, button_id, label_id, variable, value):@@ -686,18 +685,20 @@ def OptCheckbox (name, window, button_id, label_id, variable, value): button = window.GetControl (button_id) button.SetFlags (IE_GUI_BUTTON_CHECKBOX, OP_OR)- button.SetState (IE_GUI_BUTTON_SELECTED) button.SetEvent (IE_GUI_BUTTON_ON_PRESS, eval("DisplayHelp" + name)) button.SetVarAssoc (variable, value)++ label = window.GetControl (label_id)+ label.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_SET)+ label.SetState (IE_GUI_BUTTON_LOCKED)+ return button -def OptButton (name, window, button_id, button_strref):+def OptButton (name, window, button_id, label_strref): """Standard subwindow button for option windows""" button = window.GetControl (button_id) button.SetEvent (IE_GUI_BUTTON_ON_PRESS, eval("Open%sWindow" %name))-- button.SetText (button_strref)-+ button.SetText (label_strref) def OptDone (name, window, button_id): """Standard `Done' button for option windows"""@@ -719,6 +720,5 @@ def OptHelpText (name, window, text_id, text_strref): text.SetText (text_strref) return text - ################################################### # End of file GUIOPT.pydiff --git a/gemrb/GUIScripts/bg1/GUIPR.py b/gemrb/GUIScripts/bg1/GUIPR.pyindex ea4b081..ebd0637 100644--- a/gemrb/GUIScripts/bg1/GUIPR.py+++ b/gemrb/GUIScripts/bg1/GUIPR.py@@ -50,7 +50,7 @@ def OpenPriestWindow (): if OptionsWindow: OptionsWindow.Unload () if PortraitWindow:- PortraitWindow.Unload ()+ PortraitWindow.Unload () PriestWindow = None GemRB.SetVar ("OtherWindow", -1) GUICommon.GameWindow.SetVisible(WINDOW_VISIBLE)diff --git a/gemrb/GUIScripts/bg1/GUIREC.py b/gemrb/GUIScripts/bg1/GUIREC.pyindex 9bbaff0..b8b188c 100644--- a/gemrb/GUIScripts/bg1/GUIREC.py+++ b/gemrb/GUIScripts/bg1/GUIREC.py@@ -48,7 +48,6 @@ ScriptTextArea = None SelectedTextArea = None PortraitWindow = None OldPortraitWindow = None-OldVoiceSet = None # the available sounds SoundSequence = [ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', \@@ -70,7 +69,7 @@ def OpenRecordsWindow (): if OptionsWindow: OptionsWindow.Unload () if PortraitWindow:- PortraitWindow.Unload ()+ PortraitWindow.Unload () RecordsWindow = None GemRB.SetVar ("OtherWindow", -1) GUICommon.GameWindow.SetVisible(WINDOW_VISIBLE)@@ -1079,19 +1078,16 @@ def OpenSoundWindow (): global SubCustomizeWindow global VoiceList global Gender- global OldVoiceSet - pc = GemRB.GameGetSelectedPCSingle ()- OldVoiceSet = GemRB.GetPlayerSound (pc) SubCustomizeWindow = GemRB.LoadWindow (20) VoiceList = SubCustomizeWindow.GetControl (5) VoiceList.SetFlags (IE_GUI_TEXTAREA_SELECTABLE)+ pc = GemRB.GameGetSelectedPCSingle () Gender = GemRB.GetPlayerStat (pc, IE_SEX, 1) VoiceList.SetVarAssoc ("Selected", 0)- VoiceList.GetCharSounds()- VoiceList.SelectText (OldVoiceSet)+ RowCount=VoiceList.GetCharSounds() PlayButton = SubCustomizeWindow.GetControl (7) PlayButton.SetText (17318)@@ -1109,17 +1105,11 @@ def OpenSoundWindow (): PlayButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, PlaySoundPressed) DoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, DoneSoundWindow)- CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, CloseSoundWindow)+ CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, CloseSubCustomizeWindow) SubCustomizeWindow.ShowModal (MODAL_SHADOW_GRAY) return -def CloseSoundWindow ():- pc = GemRB.GameGetSelectedPCSingle ()- GemRB.SetPlayerSound (pc, OldVoiceSet)- CloseSubCustomizeWindow ()- return- def DoneSoundWindow (): pc = GemRB.GameGetSelectedPCSingle () CharSound = VoiceList.QueryText ()@@ -1132,21 +1122,9 @@ def PlaySoundPressed(): global CharSoundWindow, SoundIndex, SoundSequence CharSound = VoiceList.QueryText ()- tmp = SoundIndex while (not GemRB.HasResource (CharSound + SoundSequence[SoundIndex], RES_WAV)):- NextSound()- if SoundIndex == tmp:- break- else:- NextSound()- GemRB.PlaySound (CharSound + SoundSequence[SoundIndex], 0, 0, 5)- return--def NextSound():- global SoundIndex, SoundSequence- SoundIndex += 1- if SoundIndex >= len(SoundSequence):- SoundIndex = 0+ GUICG19.NextSound()+ GemRB.PlaySound (CharSound + SoundSequence[SoundIndex], 0, 0, 4) return def OpenColorWindow ():diff --git a/gemrb/GUIScripts/bg1/GUISAVE.py b/gemrb/GUIScripts/bg1/GUISAVE.pyindex d5673e7..b408336 100644--- a/gemrb/GUIScripts/bg1/GUISAVE.py+++ b/gemrb/GUIScripts/bg1/GUISAVE.py@@ -157,6 +157,7 @@ def ConfirmedSaveGame(): if ConfirmWindow: ConfirmWindow.Unload () OpenSaveWindow() # close window+ GemRB.EnterGame () return def SavePress():diff --git a/gemrb/GemRB.cpp b/gemrb/GemRB.cppindex 9f8b08b..9a17e86 100644--- a/gemrb/GemRB.cpp+++ b/gemrb/GemRB.cpp@@ -35,7 +35,7 @@ #ifdef ANDROID #include <SDL/SDL.h>-#include "audio.h"+#include "Audio.h" // pause audio playing if app goes in background static void appPutToBackground()diff --git a/gemrb/plugins/OpenALAudio/OpenALAudio.cpp b/gemrb/plugins/OpenALAudio/OpenALAudio.cppindex f3c0338..a80fb23 100644--- a/gemrb/plugins/OpenALAudio/OpenALAudio.cpp+++ b/gemrb/plugins/OpenALAudio/OpenALAudio.cpp@@ -517,11 +517,18 @@ bool OpenALAudioDriver::Pause() checkALError("Unable to pause music source", "WARNING"); MusicPlaying = false; SDL_mutexV( musicMutex );+ ((AmbientMgrAL*) ambim)->deactivate();+#ifdef ANDROID + al_android_pause_playback();+#endif return true; } bool OpenALAudioDriver::Resume() {+#ifdef ANDROID + al_android_resume_playback();+#endif SDL_mutexP( musicMutex ); if (!alIsSource( MusicSource )) { SDL_mutexV( musicMutex );@@ -531,6 +538,7 @@ bool OpenALAudioDriver::Resume() checkALError("Unable to resume music source", "WARNING"); MusicPlaying = true; SDL_mutexV( musicMutex );+ ((AmbientMgrAL*) ambim)->activate(); return true; } diff --git a/gemrb/plugins/OpenALAudio/OpenALAudio.h b/gemrb/plugins/OpenALAudio/OpenALAudio.hindex 2e3329f..a942216 100644--- a/gemrb/plugins/OpenALAudio/OpenALAudio.h+++ b/gemrb/plugins/OpenALAudio/OpenALAudio.h@@ -49,6 +49,10 @@ #include <alc.h> #endif +#ifdef ANDROID+#include <AL/android.h>+#endif+ #define RETRY 5 #define BUFFER_CACHE_SIZE 100 #define MAX_STREAMS 30