diff options
| author | Torbjörn Andersson | 2004-01-01 15:22:15 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2004-01-01 15:22:15 +0000 |
| commit | 18f8916c3aef4b0dec659a0c053517bb9c7aa880 (patch) | |
| tree | 16240c407a58b01362e039b4141006dc1d49d369 /sword1/sword1.cpp | |
| parent | 033a847e7769ce46a13fbcdd58230d22623600f7 (diff) | |
| download | scummvm-rg350-18f8916c3aef4b0dec659a0c053517bb9c7aa880.tar.gz scummvm-rg350-18f8916c3aef4b0dec659a0c053517bb9c7aa880.tar.bz2 scummvm-rg350-18f8916c3aef4b0dec659a0c053517bb9c7aa880.zip | |
Rewrote the music code. It now follows the same basic idea as the one in
BS2, which has worked pretty well so far. I haven't implemented pausing and
volume since the code I replaced didn't have it either, as far as I could
tell.
svn-id: r12070
Diffstat (limited to 'sword1/sword1.cpp')
| -rw-r--r-- | sword1/sword1.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp index 19bbe51a03..5360910410 100644 --- a/sword1/sword1.cpp +++ b/sword1/sword1.cpp @@ -1116,7 +1116,6 @@ uint8 SwordEngine::mainLoop(void) { SwordLogic::_scriptVars[SCREEN] = SwordLogic::_scriptVars[NEW_SCREEN]; do { - _music->stream(); uint32 frameTime = _system->get_msecs(); _logic->engine(); _logic->updateScreenParams(); // sets scrolling @@ -1154,7 +1153,6 @@ uint8 SwordEngine::mainLoop(void) { if ((retCode == 0) && (SwordLogic::_scriptVars[SCREEN] != 53) && _systemVars.wantFade) { _screen->fadeDownPalette(); while (_screen->stillFading()) { - _music->stream(); _screen->updateScreen(); delay(1000/12); } |