[Scummvm-cvs-logs] SF.net SVN: scummvm:[36223] scummvm/branches/branch-0-13-0/engines/tucker

[cyx at users.sourceforge.net]

Revision: 36223
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36223&view=rev
Author:   cyx
Date:     2009-02-06 18:54:14 +0000 (Fri, 06 Feb 2009)

Log Message:
-----------
backport 36160: fixed invalid dirty rect for infobar ; added code difference in infobar display for DE version (tracker items #2523881,2523924)

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/engines/tucker/resource.cpp
    scummvm/branches/branch-0-13-0/engines/tucker/tucker.cpp

Modified: scummvm/branches/branch-0-13-0/engines/tucker/resource.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/tucker/resource.cpp	2009-02-05 19:27:31 UTC (rev 36222)
+++ scummvm/branches/branch-0-13-0/engines/tucker/resource.cpp	2009-02-06 18:54:14 UTC (rev 36223)
@@ -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/branches/branch-0-13-0/engines/tucker/tucker.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/tucker/tucker.cpp	2009-02-05 19:27:31 UTC (rev 36222)
+++ scummvm/branches/branch-0-13-0/engines/tucker/tucker.cpp	2009-02-06 18:54:14 UTC (rev 36223)
@@ -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.