diff options
| author | Littleboy | 2011-06-29 15:22:43 -0400 |
|---|---|---|
| committer | Littleboy | 2011-07-01 01:17:08 -0400 |
| commit | a5398bd663064d3ebca61c3e49eeb7773eadd612 (patch) | |
| tree | e9502f2b5c11bc90e483e446bf60670c0b50f812 /engines/lastexpress/sound/entry.cpp | |
| parent | a5d001fdef730b61453cc4786f7c4ee45827549e (diff) | |
| download | scummvm-rg350-a5398bd663064d3ebca61c3e49eeb7773eadd612.tar.gz scummvm-rg350-a5398bd663064d3ebca61c3e49eeb7773eadd612.tar.bz2 scummvm-rg350-a5398bd663064d3ebca61c3e49eeb7773eadd612.zip | |
LASTEXPRESS: Fix loading of subtitles from sound name
Diffstat (limited to 'engines/lastexpress/sound/entry.cpp')
| -rw-r--r-- | engines/lastexpress/sound/entry.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/lastexpress/sound/entry.cpp b/engines/lastexpress/sound/entry.cpp index 4bdb9f7f96..2840d85ca7 100644 --- a/engines/lastexpress/sound/entry.cpp +++ b/engines/lastexpress/sound/entry.cpp @@ -752,7 +752,7 @@ void SubtitleEntry::load(Common::String filename, SoundEntry *soundEntry) { _sound = soundEntry; // Load subtitle data - if (_engine->getResourceManager()->hasFile(filename)) { + if (_engine->getResourceManager()->hasFile(_filename)) { if (getSoundQueue()->getSubtitleFlag() & 2) return; @@ -786,6 +786,8 @@ void SubtitleEntry::setupAndDraw() { } getSoundQueue()->setCurrentSubtitle(this); + + // TODO Missing code } void SubtitleEntry::draw() { @@ -801,13 +803,11 @@ void SubtitleEntry::draw() { } void SubtitleEntry::drawOnScreen() { - getSoundQueue()->setSubtitleFlag(getSoundQueue()->getSubtitleFlag() & -1); - if (_data == NULL) return; - if (getSoundQueue()->getSubtitleFlag() & 1) - _engine->getGraphicsManager()->draw(_data, GraphicsManager::kBackgroundOverlay); + getSoundQueue()->setSubtitleFlag(getSoundQueue()->getSubtitleFlag() & -2); + _engine->getGraphicsManager()->draw(_data, GraphicsManager::kBackgroundOverlay); } } // End of namespace LastExpress |