[Scummvm-cvs-logs] scummvm master -> 2cbcc76789f72f693763661422e4bf30b2f3441d

clone2727 clone2727 at gmail.com
Fri Mar 11 00:48:05 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2cbcc76789 SCI: Fix uncompressed SCI1.1 views


Commit: 2cbcc76789f72f693763661422e4bf30b2f3441d
    https://github.com/scummvm/scummvm/commit/2cbcc76789f72f693763661422e4bf30b2f3441d
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-03-10T15:45:51-08:00

Commit Message:
SCI: Fix uncompressed SCI1.1 views

A regression from d2ad7898d93

Changed paths:
    engines/sci/graphics/view.cpp



diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp
index 402a69d..b5ab618 100644
--- a/engines/sci/graphics/view.cpp
+++ b/engines/sci/graphics/view.cpp
@@ -476,6 +476,12 @@ void unpackCelData(byte *inBuffer, byte *celBitmap, byte clearColor, int pixelCo
 		break;
 	case kViewVga:
 	case kViewVga11:
+		// If we have no RLE data, the image is just uncompressed
+		if (rlePos == 0) {
+			memcpy(outPtr, literalPtr, pixelCount);
+			break;
+		}
+
 		while (pixelNr < pixelCount) {
 			curByte = *rlePtr++;
 			runLength = curByte & 0x3F;






More information about the Scummvm-git-logs mailing list