From: <ave...@us...> - 2004-02-10 23:03:08
|
Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18684/iwd2 Modified Files: Songs.py Start.py Log Message: Fix: LoadMusicPL will automatically End the previous music, and start the new music. This eliminates the need of a separate StartMusicPL guiscript function. Adding a second argument of 1 will HardEnd the previous music. Index: Songs.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd2/Songs.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Songs.py 26 Dec 2003 16:38:05 -0000 1.1 --- Songs.py 10 Feb 2004 22:59:27 -0000 1.2 *************** *** 33,39 **** s = GemRB.GetVar("MovieIndex") t = GemRB.GetTableValue(MoviesTable, s, 0) - GemRB.HardEndPL() GemRB.LoadMusicPL(t) - GemRB.StartPL() return --- 33,37 ---- *************** *** 42,46 **** def DonePress(): - GemRB.HardEndPL() GemRB.UnloadWindow(MovieWindow) GemRB.SetNextScript("Start") --- 40,43 ---- Index: Start.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd2/Start.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Start.py 26 Nov 2003 19:52:51 -0000 1.7 --- Start.py 10 Feb 2004 22:59:27 -0000 1.8 *************** *** 50,54 **** GemRB.SetVisible(StartWindow, 1) GemRB.LoadMusicPL("Theme.mus") - GemRB.StartPL() return --- 50,53 ---- |