[Scummvm-cvs-logs] SF.net SVN: scummvm:[36160] scummvm/trunk/engines/tucker
cyx at users.sourceforge.net
cyx at users.sourceforge.net
Sat Jan 31 10:44:28 CET 2009
Revision: 36160
http://scummvm.svn.sourceforge.net/scummvm/?rev=36160&view=rev
Author: cyx
Date: 2009-01-31 09:44:27 +0000 (Sat, 31 Jan 2009)
Log Message:
-----------
fixed invalid dirty rect for infobar ; added code difference in infobar display for DE version (tracker items #2523881,2523924)
Modified Paths:
--------------
scummvm/trunk/engines/tucker/resource.cpp
scummvm/trunk/engines/tucker/tucker.cpp
Modified: scummvm/trunk/engines/tucker/resource.cpp
===================================================================
--- scummvm/trunk/engines/tucker/resource.cpp 2009-01-31 09:29:49 UTC (rev 36159)
+++ scummvm/trunk/engines/tucker/resource.cpp 2009-01-31 09:44:27 UTC (rev 36160)
@@ -937,9 +937,8 @@
_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
}
}
}
Modified: scummvm/trunk/engines/tucker/tucker.cpp
===================================================================
--- scummvm/trunk/engines/tucker/tucker.cpp 2009-01-31 09:29:49 UTC (rev 36159)
+++ scummvm/trunk/engines/tucker/tucker.cpp 2009-01-31 09:44:27 UTC (rev 36160)
@@ -1407,7 +1407,7 @@
if (_conversationOptionsCount > 0) {
drawConversationTexts();
}
- addDirtyRect(0, 140, 320, 60);
+ addDirtyRect(_scrollOffset, 140, 320, 60);
}
void TuckerEngine::drawConversationTexts() {
@@ -1948,7 +1948,7 @@
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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list