diff options
| author | johndoe123 | 2014-01-06 23:19:32 +0100 |
|---|---|---|
| committer | johndoe123 | 2014-01-06 23:19:32 +0100 |
| commit | 4f6c3efa15c68dfa49bf5e6fe75dec034abe903b (patch) | |
| tree | 01eecd128ea4d38c3084b0c0f0cd8c6ecf22c618 /engines/fullpipe/scenes/scene16.cpp | |
| parent | 67483e591f943b65aeced1a5b76486d44aa2d364 (diff) | |
| parent | 9754be2d07599a2b9db7816450d282c7cecd78cb (diff) | |
| download | scummvm-rg350-4f6c3efa15c68dfa49bf5e6fe75dec034abe903b.tar.gz scummvm-rg350-4f6c3efa15c68dfa49bf5e6fe75dec034abe903b.tar.bz2 scummvm-rg350-4f6c3efa15c68dfa49bf5e6fe75dec034abe903b.zip | |
Merge branch 'master' of github.com:scummvm/scummvm
Diffstat (limited to 'engines/fullpipe/scenes/scene16.cpp')
| -rw-r--r-- | engines/fullpipe/scenes/scene16.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp index a280273e6a..b1e261287a 100644 --- a/engines/fullpipe/scenes/scene16.cpp +++ b/engines/fullpipe/scenes/scene16.cpp @@ -121,7 +121,7 @@ int scene16_updateCursor() { } void sceneHandler16_laughSound() { - int snd; + int snd = SND_16_035; switch (g_vars->scene16_sound) { case SND_16_034: @@ -191,7 +191,7 @@ void sceneHandler16_fillMug() { mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GIRLOUT), 0, 1); mq->replaceKeyCode(-1, g_vars->scene16_walkingGirl->_okeyCode); - if (mq->chain(g_vars->scene16_walkingGirl) || !mq) + if (mq->chain(g_vars->scene16_walkingGirl)) return; } delete mq; |