diff options
| author | Colin Snover | 2017-11-14 12:48:41 -0600 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-11-18 22:35:12 +0100 |
| commit | ff96db23dfd9e2075a710786fa0b1a01c6759a02 (patch) | |
| tree | 2014aef31b047f8a1f1dbfd117b05997cedb733f /engines/fullpipe/scenes | |
| parent | 6f8a65c739740956930c95e1d5a5c5fe0c80fbbd (diff) | |
| download | scummvm-rg350-ff96db23dfd9e2075a710786fa0b1a01c6759a02.tar.gz scummvm-rg350-ff96db23dfd9e2075a710786fa0b1a01c6759a02.tar.bz2 scummvm-rg350-ff96db23dfd9e2075a710786fa0b1a01c6759a02.zip | |
FULLPIPE: Fix leaks and unnecessary extra allocations in FullpipeEngine
Diffstat (limited to 'engines/fullpipe/scenes')
| -rw-r--r-- | engines/fullpipe/scenes/scene04.cpp | 6 | ||||
| -rw-r--r-- | engines/fullpipe/scenes/sceneFinal.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp index b78d66d54c..4b5e105311 100644 --- a/engines/fullpipe/scenes/scene04.cpp +++ b/engines/fullpipe/scenes/scene04.cpp @@ -1086,13 +1086,13 @@ void updateSound() { return; case 1: - if (!g_fp->_mixer->isSoundHandleActive(*g_fp->_soundStream2)) { + if (!g_fp->_mixer->isSoundHandleActive(g_fp->_soundStream2)) { g_fp->playOggSound("sc4_loop.ogg", g_fp->_soundStream3); g_vars->scene04_musicStage = 2; } break; case 2: - if (!g_fp->_mixer->isSoundHandleActive(*g_fp->_soundStream3)) { + if (!g_fp->_mixer->isSoundHandleActive(g_fp->_soundStream3)) { if (g_fp->_stream2playing) { // Looop it g_fp->playOggSound("sc4_loop.ogg", g_fp->_soundStream3); } else { @@ -1102,7 +1102,7 @@ void updateSound() { } break; case 3: - if (!g_fp->_mixer->isSoundHandleActive(*g_fp->_soundStream4)) { + if (!g_fp->_mixer->isSoundHandleActive(g_fp->_soundStream4)) { g_vars->scene04_musicStage = 0; } break; diff --git a/engines/fullpipe/scenes/sceneFinal.cpp b/engines/fullpipe/scenes/sceneFinal.cpp index 30ca31b7b0..2b4100b8ce 100644 --- a/engines/fullpipe/scenes/sceneFinal.cpp +++ b/engines/fullpipe/scenes/sceneFinal.cpp @@ -124,7 +124,7 @@ void sceneHandlerFinal_fallCoin() { } void updateMusic() { - if (g_vars->sceneFinal_trackHasStarted && !g_fp->_mixer->isSoundHandleActive(*g_fp->_soundStream1)) { // loop music + if (g_vars->sceneFinal_trackHasStarted && !g_fp->_mixer->isSoundHandleActive(g_fp->_soundStream1)) { // loop music sceneHandlerFinal_startMusic("track16.ogg"); } } |