diff options
| author | D G Turner | 2012-10-12 17:03:32 +0100 |
|---|---|---|
| committer | D G Turner | 2012-10-12 17:03:32 +0100 |
| commit | 151b7beb47ec4b964862d6779bd48e3a33482bbd (patch) | |
| tree | 867717c5266d0908d95edd82560599be20a4ede9 /engines/lure/decode.cpp | |
| parent | 80af0e239473f85c49cc2da3c848dfcde41d4a37 (diff) | |
| parent | 2b55837650c4229dc3d75b660cecfc7a3292e5e0 (diff) | |
| download | scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.tar.gz scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.tar.bz2 scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.zip | |
Merge branch 'master' into teenagentRefactor
Conflicts:
engines/teenagent/callbacks.cpp
Diffstat (limited to 'engines/lure/decode.cpp')
| -rw-r--r-- | engines/lure/decode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/lure/decode.cpp b/engines/lure/decode.cpp index 1338559534..484126c43f 100644 --- a/engines/lure/decode.cpp +++ b/engines/lure/decode.cpp @@ -255,7 +255,7 @@ MemoryBlock *PictureDecoder::vgaDecode(MemoryBlock *src, uint32 maxOutputSize) { decrCtr(); if (shlCarry()) break; - + AL = dataIn->data()[BP + 3]; } else { decrCtr(); @@ -375,7 +375,7 @@ uint32 AnimationDecoder::decode_data(MemoryBlock *src, MemoryBlock *dest, uint32 // Main loop bool loopFlag = true; while (loopFlag) { - for (;;) { + for (;;) { carry = false; rcl(currData, carry); if (--bitCtr == 0) { |