diff options
| author | Gregory Montoir | 2009-01-31 09:44:27 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2009-01-31 09:44:27 +0000 |
| commit | b2b37d3d67ab9cdadac416437c38529a26d201ca (patch) | |
| tree | cec10d387dbfda0706c32c14a48c20284f0007c2 /engines | |
| parent | 7cab9115329e60c7ed16d5288ed898d777410a04 (diff) | |
| download | scummvm-rg350-b2b37d3d67ab9cdadac416437c38529a26d201ca.tar.gz scummvm-rg350-b2b37d3d67ab9cdadac416437c38529a26d201ca.tar.bz2 scummvm-rg350-b2b37d3d67ab9cdadac416437c38529a26d201ca.zip | |
fixed invalid dirty rect for infobar ; added code difference in infobar display for DE version (tracker items #2523881,2523924)
svn-id: r36160
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/tucker/resource.cpp | 3 | ||||
| -rw-r--r-- | engines/tucker/tucker.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp index 0355d1dca9..d94b7b403f 100644 --- a/engines/tucker/resource.cpp +++ b/engines/tucker/resource.cpp @@ -937,9 +937,8 @@ void TuckerEngine::loadSound(Audio::Mixer::SoundType type, int num, int volume, _fCompressedSound.seek(dirOffset + dirSize * 8 + soundOffset); Common::MemoryReadStream *tmp = _fCompressedSound.readStream(soundSize); if (tmp) { - stream = (compressedSoundFilesTable[_compressedSoundType].makeStream)(tmp, true, 0, 0, 1); + stream = (compressedSoundFilesTable[_compressedSoundType].makeStream)(tmp, true, 0, 0, loop ? 0 : 1); } - // FIXME: looping not handled } } } diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp index 5caf246c41..39355be7a2 100644 --- a/engines/tucker/tucker.cpp +++ b/engines/tucker/tucker.cpp @@ -1407,7 +1407,7 @@ void TuckerEngine::redrawPanelOverBackground() { if (_conversationOptionsCount > 0) { drawConversationTexts(); } - addDirtyRect(0, 140, 320, 60); + addDirtyRect(_scrollOffset, 140, 320, 60); } void TuckerEngine::drawConversationTexts() { @@ -1948,7 +1948,7 @@ void TuckerEngine::drawInfoString() { if (_actionRequiresTwoObjects) { verbPreposition = (_actionVerb == 5) ? 12 : 11; verbPrepositionWidth = getStringWidth(verbPreposition, infoStrBuf) + 4; - if (_gameLang == Common::FR_FRA) { + if (_gameLang == Common::FR_FRA || _gameLang == Common::DE_DEU) { if ((_actionObj2Num > 0 || _actionObj2Type > 0) && verbPreposition > 0) { infoStringWidth = 0; verbWidth = 0; |