Merge branch 'master' into phantom

Conflicts:
	engines/mads/phantom/game_phantom.cpp
	engines/mads/phantom/globals_phantom.h
	engines/mads/phantom/phantom_scenes.h
	engines/mads/phantom/phantom_scenes1.cpp
	engines/mads/phantom/phantom_scenes1.h
	engines/sherlock/events.cpp
	engines/sherlock/inventory.cpp
	engines/sherlock/journal.cpp
	engines/sherlock/map.cpp
	engines/sherlock/map.h
	engines/sherlock/module.mk
	engines/sherlock/music.cpp
	engines/sherlock/music.h
	engines/sherlock/objects.cpp
	engines/sherlock/objects.h
	engines/sherlock/people.cpp
	engines/sherlock/people.h
	engines/sherlock/resources.cpp
	engines/sherlock/resources.h
	engines/sherlock/scalpel/drivers/adlib.cpp
	engines/sherlock/scalpel/drivers/mididriver.h
	engines/sherlock/scalpel/scalpel.cpp
	engines/sherlock/scalpel/scalpel_scene.cpp
	engines/sherlock/scalpel/scalpel_scene.h
	engines/sherlock/scalpel/scalpel_user_interface.cpp
	engines/sherlock/scalpel/scalpel_user_interface.h
	engines/sherlock/scalpel/settings.cpp
	engines/sherlock/scalpel/tsage/logo.cpp
	engines/sherlock/scalpel/tsage/logo.h
	engines/sherlock/scene.cpp
	engines/sherlock/scene.h
	engines/sherlock/screen.cpp
	engines/sherlock/screen.h
	engines/sherlock/sherlock.cpp
	engines/sherlock/sherlock.h
	engines/sherlock/sound.cpp
	engines/sherlock/sound.h
	engines/sherlock/surface.cpp
	engines/sherlock/surface.h
	engines/sherlock/talk.cpp
	engines/sherlock/talk.h
	engines/sherlock/tattoo/tattoo.cpp
	engines/sherlock/tattoo/tattoo.h
	engines/sherlock/tattoo/tattoo_scene.cpp
	engines/sherlock/tattoo/tattoo_scene.h
	engines/sherlock/tattoo/tattoo_user_interface.cpp
	engines/sherlock/tattoo/tattoo_user_interface.h
	engines/sherlock/user_interface.cpp
	engines/sherlock/user_interface.h

2 files changed, 7 insertions, 3 deletions

diff --git a/image/codecs/cinepak.cpp b/image/codecs/cinepak.cpp
index 32f6be2cd5..4e858921ee 100644
--- a/image/codecs/cinepak.cpp
+++ b/image/codecs/cinepak.cpp
@@ -433,9 +433,11 @@ const Graphics::Surface *CinepakDecoder::decodeFrame(Common::SeekableReadStream
 			for (uint16 j = 0; j < 256; j++) {
 				_curFrame.strips[i].v1_codebook[j] = _curFrame.strips[i - 1].v1_codebook[j];
 				_curFrame.strips[i].v4_codebook[j] = _curFrame.strips[i - 1].v4_codebook[j];
-				memcpy(_curFrame.strips[i].v1_dither, _curFrame.strips[i - 1].v1_dither, 256 * 4 * 4 * 4);
-				memcpy(_curFrame.strips[i].v4_dither, _curFrame.strips[i - 1].v4_dither, 256 * 4 * 4 * 4);
 			}
+
+			// Copy the QuickTime dither tables
+			memcpy(_curFrame.strips[i].v1_dither, _curFrame.strips[i - 1].v1_dither, 256 * 4 * 4 * 4);
+			memcpy(_curFrame.strips[i].v4_dither, _curFrame.strips[i - 1].v4_dither, 256 * 4 * 4 * 4);
 		}
 
 		_curFrame.strips[i].id = stream.readUint16BE();
diff --git a/image/codecs/cinepak.h b/image/codecs/cinepak.h
index dc8172ea0f..4efb1191cc 100644
--- a/image/codecs/cinepak.h
+++ b/image/codecs/cinepak.h
@@ -64,6 +64,9 @@ struct CinepakFrame {
  * Cinepak decoder.
  *
  * Used by BMP/AVI and PICT/QuickTime.
+ *
+ * Used in engines:
+ *  - sherlock
  */
 class CinepakDecoder : public Codec {
 public:
@@ -88,7 +91,6 @@ private:
 
 	byte *_ditherPalette;
 	bool _dirtyPalette;
-	byte *_rgbLookup;
 	byte *_colorMap;
 	DitherType _ditherType;