diff --git a/gemrb/GUIScripts/bg2/LoadScreen.py b/gemrb/GUIScripts/bg2/LoadScreen.py index 1e46db315b..7a6d4859c2 100644 --- a/gemrb/GUIScripts/bg2/LoadScreen.py +++ b/gemrb/GUIScripts/bg2/LoadScreen.py @@ -38,11 +38,24 @@ def StartLoadScreen (): LoadScreen = GemRB.LoadWindow (0) LoadScreen.SetFrame () Middle = LoadScreen.GetControl (3) - LoadPic = GemRB.GetGameString (STR_LOADMOS) - if LoadPic == "": - #the addition of 1 is not an error, bg2 loadpic resrefs are GTRSK002-GTRSK006 - LoadPic = "GTRSK00"+str(GemRB.Roll(1,5,1) ) - Middle.SetMOS (LoadPic) + + if not GameCheck.IsBG2Demo(): + LoadPic = GemRB.GetGameString (STR_LOADMOS) + if LoadPic == "": + #the addition of 1 is not an error, bg2 loadpic resrefs are GTRSK002-GTRSK006 + LoadPic = "GTRSK00"+str(GemRB.Roll(1,5,1) ) + Middle.SetMOS (LoadPic) + else: + # During loading, this fn is called at 0% and 70%, so take advantage of that + # and display the "quiet" frame first and the "flaming" frame the second time. + # It would be even better to display the phases inbetween as well; however, + # the bg2demo does not either, even though the frames are there. + Progress = GemRB.GetVar ("Progress") + if Progress: + Middle.SetBAM ("COADCNTR", 1, 0) + else: + Middle.SetBAM ("COADCNTR", 0, 0) + Progress = 0 GemRB.SetVar ("Progress", Progress) if GameCheck.HasTOB(): @@ -60,6 +73,10 @@ def StartLoadScreen (): LoadScreen.SetVisible (WINDOW_VISIBLE) def EndLoadScreen (): + if GameCheck.IsBG2Demo(): + Middle = LoadScreen.GetControl (3) + Middle.SetBAM ("COADCNTR", 1, 0) + LoadScreen.SetVisible (WINDOW_VISIBLE) LoadScreen.Unload() return