diff options
| author | Paul Gilbert | 2018-02-19 10:17:33 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2018-02-19 10:17:33 -0500 |
| commit | 8fc4a08e04b947bc1ca01e716a7821fe41a03381 (patch) | |
| tree | 49cba47520192e985e3b3a306c849d5d489d4933 /engines/xeen/cutscenes.cpp | |
| parent | 99c072e84495492a66e562a8dc0af6b39bf37d52 (diff) | |
| download | scummvm-rg350-8fc4a08e04b947bc1ca01e716a7821fe41a03381.tar.gz scummvm-rg350-8fc4a08e04b947bc1ca01e716a7821fe41a03381.tar.bz2 scummvm-rg350-8fc4a08e04b947bc1ca01e716a7821fe41a03381.zip | |
XEEN: Refactor to merge Sound and Music classes
The existing structure didn't make sense, as Sound only handled
sound files, but Music handled both music and short FX decoding.
I've merged Sound & MUsic into a single Sound class, and moved
the music driver to their own file, renamed to SoundDriver
Diffstat (limited to 'engines/xeen/cutscenes.cpp')
| -rw-r--r-- | engines/xeen/cutscenes.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/xeen/cutscenes.cpp b/engines/xeen/cutscenes.cpp index 46a911e096..05d9fa7b93 100644 --- a/engines/xeen/cutscenes.cpp +++ b/engines/xeen/cutscenes.cpp @@ -92,7 +92,7 @@ bool Cutscenes::subtitlesWait(uint minTime) { } bool Cutscenes::waitForLineOrSound() { - while (_vm->_sound->isPlaying() || _subtitleSize) { + while (_vm->_sound->isSoundPlaying() || _subtitleSize) { showSubtitles(); _vm->_events->pollEventsAndWait(); if (_vm->_events->isKeyMousePressed()) |