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

[eriktorbjorn]

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

Summary:
f46af2eded ZVISION: Fix bug #6787 init lzss window by same values as in original game
2d93a82e80 Merge pull request #577 from Marisa-Chan/master


Commit: f46af2eded0155a05d0e19717e6c4efd1191dab3
    https://github.com/scummvm/scummvm/commit/f46af2eded0155a05d0e19717e6c4efd1191dab3
Author: Marisa-Chan (thunder_8888 at mail.ru)
Date: 2015-01-28T09:26:45+06:00

Commit Message:
ZVISION: Fix bug #6787 init lzss window by same values as in original game

Changed paths:
    engines/zvision/file/lzss_read_stream.cpp



diff --git a/engines/zvision/file/lzss_read_stream.cpp b/engines/zvision/file/lzss_read_stream.cpp
index 6f27eaa..ca10af7 100644
--- a/engines/zvision/file/lzss_read_stream.cpp
+++ b/engines/zvision/file/lzss_read_stream.cpp
@@ -31,8 +31,9 @@ LzssReadStream::LzssReadStream(Common::SeekableReadStream *source)
 	  // It's convention to set the starting cursor position to blockSize - 16
 	  _windowCursor(0x0FEE),
 	  _eosFlag(false) {
-	// Clear the window to null
-	memset(_window, 0, BLOCK_SIZE);
+	// All values up to _windowCursor inits by 0x20
+	memset(_window, 0x20, _windowCursor);
+	memset(_window + _windowCursor, 0, BLOCK_SIZE - _windowCursor);
 }
 
 uint32 LzssReadStream::decompressBytes(byte *destination, uint32 numberOfBytes) {


Commit: 2d93a82e8060b2c9d05438c0ba352ad4ca46f1c0
    https://github.com/scummvm/scummvm/commit/2d93a82e8060b2c9d05438c0ba352ad4ca46f1c0
Author: Torbjörn Andersson (eriktorbjorn at telia.com)
Date: 2015-01-28T06:57:35+01:00

Commit Message:
Merge pull request #577 from Marisa-Chan/master

ZVISION: Fix bug #6787 init lzss window by same values as in original game

Changed paths:
    engines/zvision/file/lzss_read_stream.cpp