diff options
| author | Paul Gilbert | 2012-06-19 22:37:56 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2012-06-19 22:37:56 +1000 |
| commit | aa775b4497746d978599dda06ca9a385c5e6dc59 (patch) | |
| tree | e432943d50c1de4f5f0e1afb802c31b89803e73a /engines/tony/tony.cpp | |
| parent | d2061f29bef9f2dadd5eda149384b5fdfbcc3ac1 (diff) | |
| download | scummvm-rg350-aa775b4497746d978599dda06ca9a385c5e6dc59.tar.gz scummvm-rg350-aa775b4497746d978599dda06ca9a385c5e6dc59.tar.bz2 scummvm-rg350-aa775b4497746d978599dda06ca9a385c5e6dc59.zip | |
TONY: Some bugfixes and cleanup for the music support code
Diffstat (limited to 'engines/tony/tony.cpp')
| -rw-r--r-- | engines/tony/tony.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp index 2c102f5c8b..8ae95af862 100644 --- a/engines/tony/tony.cpp +++ b/engines/tony/tony.cpp @@ -208,12 +208,14 @@ void TonyEngine::playMusic(int nChannel, const Common::String &fname, int nFX, b GLOBALS._curChannel = nChannel; GLOBALS._nextLoop = bLoop; GLOBALS._nextSync = nSync; + GLOBALS._nextMusic = fname; + if (GLOBALS._flipflop) GLOBALS._nextChannel = nChannel - 1; else GLOBALS._nextChannel = nChannel + 1; - uint32 hThread = CoroScheduler.createProcess(doNextMusic, &_stream, sizeof(FPStream ***)); + uint32 hThread = CoroScheduler.createProcess(doNextMusic, NULL, 0); assert(hThread != CORO_INVALID_PID_VALUE); } else if (nFX == 44) { // Cambia canale e lascia finire il primo @@ -254,7 +256,7 @@ void TonyEngine::doNextMusic(CORO_PARAM, const void *param) { Common::String fn; CORO_END_CONTEXT(_ctx); - FPStream **streams = *(FPStream ***)param; + FPStream **streams = _vm->_stream; CORO_BEGIN_CODE(_ctx); |