diff options
| author | James Brown | 2004-11-11 13:37:35 +0000 |
|---|---|---|
| committer | James Brown | 2004-11-11 13:37:35 +0000 |
| commit | 1f7ccd02938a1e418bf83ed44014631187df7fcb (patch) | |
| tree | 4520666f4533c081d991932bdb6cb81ae9f0fe7c /kyra/codecs.cpp | |
| parent | e67ffaaff0c95a25580db000e4fc1cc9ae81940c (diff) | |
| download | scummvm-rg350-1f7ccd02938a1e418bf83ed44014631187df7fcb.tar.gz scummvm-rg350-1f7ccd02938a1e418bf83ed44014631187df7fcb.tar.bz2 scummvm-rg350-1f7ccd02938a1e418bf83ed44014631187df7fcb.zip | |
Bring kyra up-to-date with patch 1051358
svn-id: r15786
Diffstat (limited to 'kyra/codecs.cpp')
| -rw-r--r-- | kyra/codecs.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kyra/codecs.cpp b/kyra/codecs.cpp index 1205442ec1..e90ebdcd68 100644 --- a/kyra/codecs.cpp +++ b/kyra/codecs.cpp @@ -84,9 +84,13 @@ int Compression::decode80(const uint8* image_in, uint8* image_out) { copyp = (const uint8*)&image_out[READ_LE_UINT16(readp)]; readp += 2; - memcpy(writep, copyp, count); - writep += count; - copyp += count; + // FIXME: Using memmove sometimes segfaults + // (reproducably for Ender), which suggests something Bad here + //memmove(writep, copyp, count); + //writep += count; + //copyp += count; + while (count--) + *writep++ = *copyp++; } else if (count == 0x3e) { //command 3 (11111110 c c v): fill |